diff --git a/Makefile.am b/Makefile.am
index d88626f9..2bd4b9e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,13 @@ SUBDIRS =					\
 	$(NULL)
 
 EXTRA_DIST =				\
+	BUGS					\
+	FAQ						\
+	HISTORY					\
+	PORTING					\
 	all.dsp					\
 	synergy.dsw				\
-	doc/doxygen.cfg			\
+	doc/doxygen.cfg.in		\
 	examples/synergy.conf	\
 	$(NULL)
 
diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in
index 7e8f886b..81b75a00 100644
--- a/dist/rpm/synergy.spec.in
+++ b/dist/rpm/synergy.spec.in
@@ -24,9 +24,7 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
 make
 
 %install
-# FIXME -- install should install doc files
 make install DESTDIR=$RPM_BUILD_ROOT
-
 strip $RPM_BUILD_ROOT/usr/bin/synergy
 strip $RPM_BUILD_ROOT/usr/bin/synergyd
 
@@ -37,4 +35,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 /usr/bin/synergy
 /usr/bin/synergyd
-# FIXME -- add doc files
+%doc AUTHORS BUGS COPYING ChangeLog FAQ INSTALL NEWS README