diff --git a/startup-notification.changes b/startup-notification.changes
index 10b74cb..a214e95 100644
--- a/startup-notification.changes
+++ b/startup-notification.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct 29 15:56:32 CET 2007 - sbrabec@suse.cz
+
+- Reordered spec file sections to make OBS rewriting of Requires
+  working properly.
+- Spec file cleanup.
+- Fixed devel Requires.
+
 -------------------------------------------------------------------
 Thu Aug  2 18:15:32 CEST 2007 - maw@suse.de
 
diff --git a/startup-notification.spec b/startup-notification.spec
index fefa783..cdc1b4c 100644
--- a/startup-notification.spec
+++ b/startup-notification.spec
@@ -12,13 +12,11 @@
 
 Name:           startup-notification
 BuildRequires:  gnome-common xorg-x11-devel
-URL:            http://www.freedesktop.org/wiki/Software/startup-notification
-%define prefix /usr
+Url:            http://www.freedesktop.org/wiki/Software/startup-notification
 License:        GPL v2 or later
 Group:          System/X11/Utilities
-Autoreqprov:    on
 Version:        0.9
-Release:        1
+Release:        24
 Summary:        Reference Implementation for the Startup-Notification Protocol
 Source:         startup-notification-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -33,41 +31,10 @@ Authors:
 --------
     Havoc Pennington <hp@redhat.com>
 
-%prep
-%setup -n startup-notification-%{version}
-
-%build
-%{?suse_update_config:%{suse_update_config -f}}
-libtoolize --force
-aclocal
-automake -c -a -f
-autoconf
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-./configure --prefix=/usr \
-	--libdir=%{_libdir} \
-	--mandir=%{_mandir} \
-	--infodir=%{_infodir}
-make 
-
-%install
-export LIBRARY_PATH=$RPM_BUILD_ROOT/usr/%_lib
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files 
-%defattr(-,root,root)
-%doc AUTHORS COPYING README NEWS ChangeLog 
-%{prefix}/%_lib/*.so.*
 %package devel
 Summary:        Include Files and Libraries mandatory for Development.
 Group:          Development/Libraries/GNOME
-Requires:       startup-notification = %{version} xorg-x11-libX11-devel
-Autoreqprov:    on
+Requires:       %{name} = %{version} glibc-devel xorg-x11-libX11-devel xorg-x11-libSM-devel xorg-x11-libICE-devel
 
 %description devel
 This package contains all necessary include files and libraries needed
@@ -79,18 +46,48 @@ Authors:
 --------
     Havoc Pennington <hp@redhat.com>
 
+%prep
+%setup -q
+
+%build
+#{?suse_update_config:{suse_update_config -f}}
+#libtoolize --force
+#aclocal
+#automake -c -a -f
+#autoconf
+autoreconf -f -i
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%configure
+make %{?jobs:-j %jobs}
+
+%install
+#export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+%makeinstall
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files 
+%defattr(-,root,root)
+%doc AUTHORS COPYING README NEWS ChangeLog 
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
-%{prefix}/%_lib/pkgconfig/*.pc
-%{prefix}/%_lib/*.so
-%{prefix}/%_lib/*a
-%{prefix}/include/startup-notification-1.0
+%{_includedir}/startup-notification-1.0
+%{_libdir}/*.so
+%{_libdir}/*.*a
+%{_libdir}/pkgconfig/*.pc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
 %changelog
+* Mon Oct 29 2007 - sbrabec@suse.cz
+- Reordered spec file sections to make OBS rewriting of Requires
+  working properly.
+- Spec file cleanup.
+- Fixed devel Requires.
 * Thu Aug 02 2007 - maw@suse.de
 - Update to version 0.9:
   + plug some memory leaks