diff --git a/gpsd.changes b/gpsd.changes
index f38398d..f2a65ff 100644
--- a/gpsd.changes
+++ b/gpsd.changes
@@ -1,15 +1,14 @@
 -------------------------------------------------------------------
-Sun Jun 24 02:58:04 UTC 2018 - stefan.bruens@rwth-aachen.de
+Thu Jun 28 07:57:08 UTC 2018 - mpluskal@suse.com
 
-- Correct Requires for gpsd-clients subpackage
+- Fix requires for gpsd-clients
+- Cleanup spec file a bit
 
 -------------------------------------------------------------------
 Fri Jun 15 16:03:49 UTC 2018 - stefan.bruens@rwth-aachen.de
 
 - Require python3 versions for packages importing python modules, all
   scripts use python3 as interpreter.
-- Fix building on Leap 42.x, python2_sitearch is defined in
-  python-rpm-macros 
 
 -------------------------------------------------------------------
 Fri Dec  1 15:05:22 UTC 2017 - mimi.vx@gmail.com
diff --git a/gpsd.spec b/gpsd.spec
index b418f6e..5468c4a 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gpsd
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,17 +20,13 @@
 %define		    libgps libgps%{sover}
 %define		    libQgps libQgpsmm%{sover}
 %define         _udevdir %(pkg-config --variable udevdir udev)
-#Compat macro for new _fillupdir macro introduced in Nov 2017
-%if ! %{defined _fillupdir}
-  %define _fillupdir %{_localstatedir}/adm/fillup-templates
-%endif
 Name:           gpsd
 Version:        3.17
 Release:        0
 Summary:        Service daemon for mediating access to a GPS
 License:        BSD-3-Clause
 Group:          Hardware/Other
-Url:            http://www.catb.org/gpsd/
+URL:            http://www.catb.org/gpsd/
 Source0:        http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
 Source1:        rules.gpsd
 Source2:        udev.gpsd
@@ -45,7 +41,6 @@ BuildRequires:  hicolor-icon-theme
 BuildRequires:  libcap-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python-rpm-macros
 BuildRequires:  scons >= 2.3.0
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  update-desktop-files
@@ -140,9 +135,9 @@ You will need to have gpsd installed for it to work.
 Summary:        Example clients for gpsd
 Group:          Hardware/Other
 Requires:       python3-cairo
-Requires:       python3-gpsd
 Requires:       python3-gobject
-Requires:       python3-gobject-gdk
+Requires:       python3-gobject-Gdk
+Requires:       python3-gpsd
 
 %description clients
 xgps is a simple test client for gpsd with an X interface. It displays
@@ -215,7 +210,7 @@ do
         build
 
     # Fix python interpreter path.
-    sed -e "s,#!/usr/bin/\(python[23]\?\|env \+python[23]\?\),#!%{_bindir}/${pyversions[i]},g" -i \
+    sed -e "s,#!%{_bindir}/\(python[23]\?\|env \+python[23]\?\),#!%{_bindir}/${pyversions[i]},g" -i \
         gegps gpscat gpsfake xgps xgpsspeed gpsprof gps/*.py
 
     popd
@@ -284,7 +279,8 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
 %postun -n %{libQgps} -p /sbin/ldconfig
 
 %files
-%doc %{name}-%{version}/python3/%{name}-%{version}/README %{name}-%{version}/python3/%{name}-%{version}/COPYING
+%license %{name}-%{version}/python3/%{name}-%{version}/COPYING
+%doc %{name}-%{version}/python3/%{name}-%{version}/README
 %{_mandir}/man?/gpsd.*
 %{_mandir}/man?/gpsdctl.*
 %{_mandir}/man?/gpsctl.*
@@ -341,7 +337,7 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
 %{_mandir}/man?/gps.*
 %{_mandir}/man?/gegps.*
 %{_mandir}/man?/cgps.*
-%{_mandir}/man?/lcdgps.1.*
+%{_mandir}/man?/lcdgps.*
 %{_mandir}/man?/xgps.*
 %{_mandir}/man?/xgpsspeed.*
 %{_mandir}/man?/gpspipe.*