diff --git a/startup-notification.spec b/startup-notification.spec
index 7224abd..bef168f 100644
--- a/startup-notification.spec
+++ b/startup-notification.spec
@@ -1,13 +1,13 @@
 Summary: Library for tracking application startup
 Name: startup-notification
 Version: 0.8
-Release: 2
+Release: 3
 URL: http://www.freedesktop.org/software/startup-notification/
 Source0: %{name}-%{version}.tar.gz
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: XFree86-devel
+BuildRequires: libX11-devel
 
 %description
 
@@ -20,7 +20,7 @@ feedback such as a busy cursor, among other features.
 Summary: Development portions of startup-notification
 Group: Development/Libraries
 Requires: startup-notification = %{version}-%{release}
-Requires: XFree86-devel
+Requires: libX11-devel
 
 %description devel
 
@@ -29,16 +29,16 @@ Header files and static libraries for libstartup-notification.
 %prep
 %setup -q
 
-%configure
-
 %build
 
+%configure
+
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -65,6 +65,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Tue Nov  1 2005 Ray Strode <rstrode@redhat.com> 0.8-3
+- change to new modular X dependencies
+- move %configure to build instead of %prep
+- use make install DESTDIR=$RPM_BUILD_ROOT instead of
+  %makeinstall
+
 * Wed Mar  2 2005 Mark McLoughlin <markmc@redhat.com> 0.8-2
 - Rebuild with gcc4