diff --git a/libXdmcp.spec b/libXdmcp.spec
index c8001a4..6cd026b 100644
--- a/libXdmcp.spec
+++ b/libXdmcp.spec
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXdmcp runtime library
 Name: libXdmcp
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{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-proto-devel
 
@@ -19,8 +20,11 @@ X.Org X11 libXdmcp runtime library
 %package devel
 Summary: X.Org X11 libXdmcp development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+# xorg-x11-proto-devel is needed by xdmcp.pc
+Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -34,7 +38,6 @@ X.Org X11 libXdmcp development package
 %define with_static 0
 
 %build
-
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -42,9 +45,9 @@ X.Org X11 libXdmcp development package
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -58,7 +61,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXdmcp.so.6
 %{_libdir}/libXdmcp.so.6.0.0
 
@@ -73,6 +75,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
+- Added "BuildRequires: xorg-x11-proto-devel"
+- Added "Requires: xorg-x11-proto-devel" to devel package, needed by xdmcp.pc
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson@redhat.com> 1.0.1-1
 - Update to 1.0.1