diff --git a/gpsd.changes b/gpsd.changes
index 53a6121..ddf206c 100644
--- a/gpsd.changes
+++ b/gpsd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 24 13:24:50 CEST 2008 - jreuter@suse.de
+
+- Fix RPM group tag for devel package
+- Cleanup spec file
+
 -------------------------------------------------------------------
 Sat Mar 22 20:02:15 CET 2008 - lrupp@suse.de
 
diff --git a/gpsd.spec b/gpsd.spec
index eb36539..d5e18f5 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -17,12 +17,12 @@ License:        BSD 3-Clause
 Url:            http://gpsd.berlios.de/
 Group:          Hardware/Other
 Version:        2.37
-Release:        1
+Release:        10
 Requires:       udev
 PreReq:         coreutils %fillup_prereq
-BuildRequires:  gcc-c++ ncurses-devel openmotif openmotif-devel python-devel udev xmlto
-BuildRequires:  dbus-1-devel dbus-1-glib-devel update-desktop-files
+BuildRequires:  gcc-c++ ncurses-devel openmotif openmotif-devel python-devel udev update-desktop-files xmlto
 %if 0%{?suse_version} > 1020
+BuildRequires:  dbus-1-glib-devel
 BuildRequires:  fdupes
 %endif
 Source:         %{name}-%{version}.tar.bz2
@@ -68,6 +68,7 @@ Authors:
     Ville Nuorvala <vnuorval@tcs.hut.fi>
 
 %package devel
+License:        BSD 3-Clause
 Summary:        Client libraries in C and Python for talking to a running gpsd or GPS
 Group:          Hardware/Other
 Requires:       %name = %version
@@ -93,6 +94,7 @@ Authors:
     Ville Nuorvala <vnuorval@tcs.hut.fi>
 
 %package clients
+License:        BSD 3-Clause
 Summary:        Clients for gpsd with an X interface
 Group:          Hardware/Other
 
@@ -129,7 +131,9 @@ Authors:
 
 %build
 %configure --disable-static \
+%if 0%{?suse_version} > 1020
            --enable-dbus \
+%endif
            --enable-garmintxt \
            --enable-tnt
 %__make %{?jobs:-j%jobs}
@@ -176,10 +180,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc README INSTALL COPYING gpsd.php
-%doc %{_mandir}/man?/gpsd.*
-%doc %{_mandir}/man?/gpsprof.*
-%doc %{_mandir}/man?/gpsctl.*
-%doc %{_mandir}/man?/sirfmon.*
+%{_mandir}/man?/gpsd.*
+%{_mandir}/man?/gpsprof.*
+%{_mandir}/man?/gpsctl.*
+%{_mandir}/man?/sirfmon.*
 /lib/udev/gpsd.sh
 %config(noreplace) /etc/udev/rules.d/*
 %{_sbindir}/gpsd
@@ -193,13 +197,13 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root)
 %doc README INSTALL COPYING TODO
-%doc %{_mandir}/man?/gpsfake.*
-%doc %{_mandir}/man?/gpscat.*
-%doc %{_mandir}/man?/libgps*.*
-%doc %{_mandir}/man?/rtcmdecode.*
-%doc %{_mandir}/man?/gpsflash.*
-%doc %{_mandir}/man?/rtcm-104.*
-%doc %{_mandir}/man?/srec.*
+%{_mandir}/man?/gpsfake.*
+%{_mandir}/man?/gpscat.*
+%{_mandir}/man?/libgps*.*
+%{_mandir}/man?/rtcmdecode.*
+%{_mandir}/man?/gpsflash.*
+%{_mandir}/man?/rtcm-104.*
+%{_mandir}/man?/srec.*
 %{_bindir}/gpsfake
 %{_bindir}/rtcmdecode
 %{_bindir}/gpsflash
@@ -214,22 +218,27 @@ rm -rf %{buildroot}
 
 %files clients
 %defattr(-,root,root)
-%doc %{_mandir}/man?/gps.*
-%doc %{_mandir}/man?/cgps.*
-%doc %{_mandir}/man?/xgps.*
-%doc %{_mandir}/man?/xgpsspeed.*
-%doc %{_mandir}/man?/gpspipe.*
-%doc %{_mandir}/man?/cgpxlogger.*
+%{_mandir}/man?/gps.*
+%{_mandir}/man?/cgps.*
+%{_mandir}/man?/xgps.*
+%{_mandir}/man?/xgpsspeed.*
+%{_mandir}/man?/gpspipe.*
+%{_mandir}/man?/cgpxlogger.*
 %{_bindir}/xgps
 %{_bindir}/xgpsspeed
 %{_bindir}/cgps
 %{_bindir}/cgpxlogger
 %{_bindir}/gpspipe
+%if 0%{?suse_version} > 1020
 %{_bindir}/gpxlogger
+%endif
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.xpm
 
 %changelog
+* Thu Apr 24 2008 jreuter@suse.de
+- Fix RPM group tag for devel package
+- Cleanup spec file
 * Sat Mar 22 2008 lrupp@suse.de
 - update to 2.37
   Fixes: