diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index d1a5a9f..92b5d70 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -80,13 +80,15 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_docdir}/xproto
 for dir in $(ls -1) ; do
 	pushd $dir
 	make install DESTDIR=$RPM_BUILD_ROOT
-	install -m 444 COPYING-${dir%%-*} $RPM_BUILD_ROOT/%{_docdir}/xproto
+	install -m 444 COPYING-${dir%%-*} $OLDPWD
 	popd
 done
+for i in damage randr ; do
+    mv $RPM_BUILD_ROOT/usr/share/doc/${i}proto/${i}proto.txt .
+done
 
 # libXext still needs XLbx.h and lbxstr.h to build.  The rest are junk.
 rm -f $RPM_BUILD_ROOT%{_includedir}/X11/extensions/lbxbuf.h \
@@ -101,12 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%dir %{_docdir}/xproto
-%doc %{_docdir}/xproto/COPYING-*
-%dir %{_docdir}/randrproto
-%doc %{_docdir}/randrproto/randrproto.txt
-%dir %{_docdir}/damageproto
-%doc %{_docdir}/damageproto/damageproto.txt
+%doc COPYING-*
+%doc randrproto.txt
+%doc damageproto.txt
 %dir %{_includedir}/GL
 %{_includedir}/GL/glxint.h
 %{_includedir}/GL/glxmd.h
@@ -276,6 +275,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Mon Mar 12 2007 Adam Jackson <ajax@redhat.com> 7.2-6
+- Fix doc macros as per package review (#226641)
+
 * Wed Feb 28 2007 Adam Jackson <ajax@redhat.com> 7.2-5
 - Package review cleanups (#226641)