diff --git a/libXp.spec b/libXp.spec
index 928ef86..832ed20 100644
--- a/libXp.spec
+++ b/libXp.spec
@@ -3,13 +3,14 @@
 Summary: X.Org X11 libXp runtime library
 Name: libXp
 Version: 1.0.0
-Release: 2.2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
@@ -26,8 +27,11 @@ X.Org X11 libXp runtime library
 %package devel
 Summary: X.Org X11 libXp development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# needed by xp.pc
+BuildRequires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel, xorg-x11-deprecated-libs-devel
 
@@ -42,7 +46,6 @@ X.Org X11 libXp development package
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -52,7 +55,7 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %if %{libXp_deprecated}
 {
@@ -62,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT
    rm -rf $RPM_BUILD_ROOT%{_mandir}
 }
 %endif
+# Don't encourage people to use the deprecated Xprint APIs.
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 
 # We intentionally don't ship *.la files
@@ -76,7 +80,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXp.so.6
 %{_libdir}/libXp.so.6.2.0
 
@@ -90,18 +93,21 @@ rm -rf $RPM_BUILD_ROOT
 # that keep linking to libXp, will always get the static lib and not break
 # when we eventually drop libXp?
 %{_libdir}/libXp.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xp.pc
-#%dir %{_mandir}
-#%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 #%{_mandir}/man3/*.3x*
 %endif
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.0-2.2
+* Fri Jun 09 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-3
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Added "Requires: xorg-x11-proto-devel" to devel for xp.pc
+- Remove package ownership of mandir/libdir/etc.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-2