diff --git a/valgrind.spec b/valgrind.spec
index f603442..782688e 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -152,15 +152,17 @@ popd
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages
-%if %building_docs
-mv $RPM_BUILD_ROOT/usr/share/doc/valgrind $RPM_BUILD_ROOT/usr/share/doc/packages
-%endif
+mkdir -p $RPM_BUILD_ROOT/%_defaultdocdir
+if test -d $RPM_BUILD_ROOT/usr/share/doc/valgrind; then
+     mv $RPM_BUILD_ROOT/usr/share/doc/valgrind $RPM_BUILD_ROOT/%_defaultdocdir
+fi
+mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/%name
+cp -a README* NEWS AUTHORS COPYING COPYING.DOCS $RPM_BUILD_ROOT/%_defaultdocdir/%name
 
 %files
 %defattr(-,root,root)
-%doc README* NEWS AUTHORS COPYING COPYING.DOCS
 /usr/bin/*
+%doc %_defaultdocdir/%name
 %_libdir/valgrind
 %if %building_docs
 %doc %_mandir/*/*