diff --git a/openvpn.spec b/openvpn.spec
index 0d9c461..8bd20d9 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -75,10 +75,9 @@ install -D -m 0755 sample-scripts/%{name}.init \
 install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pR contrib easy-rsa sample-{config-file,key,script}s \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pR easy-rsa $RPM_BUILD_ROOT%{_datadir}/%{name}/
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/easy-rsa/Windows
-cp %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/sample-config-files/
+cp %{SOURCE2} %{SOURCE3} sample-config-files/
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugin/lib
 for plugin in %{plugins} ; do
@@ -114,6 +113,7 @@ fi
 %doc AUTHORS COPYING COPYRIGHT.GPL INSTALL PORTS README
 # Add NEWS when it isn't zero-length.
 %doc plugin/*.txt
+%doc contrib sample-config-files sample-keys sample-scripts
 %{_mandir}/man8/%{name}.8*
 %{_sbindir}/%{name}
 %{_datadir}/%{name}/
@@ -128,6 +128,7 @@ fi
 - Comment cleanups
 - Add "processname" header to init script
 - The init script isn't a config file
+- Tag contrib, sample-config-files, sample-keys, and sample-scripts as doc
 
 * Sat Jun 25 2005 Steven Pritchard <steve@kspei.com> 2.0-1
 - Update to 2.0 final