diff --git a/spacenavd.changes b/spacenavd.changes
index 2811c4e..844efe3 100644
--- a/spacenavd.changes
+++ b/spacenavd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Oct 30 17:43:38 UTC 2016 - jengelh@inai.de
+
+- Rectify description, use source URL and avoid sysvinit calls
+  under systemd.
+
 -------------------------------------------------------------------
 Thu Oct 27 17:52:13 UTC 2016 - herbert@graeber-clan.de
 
diff --git a/spacenavd.spec b/spacenavd.spec
index 86f3013..c1d273d 100644
--- a/spacenavd.spec
+++ b/spacenavd.spec
@@ -7,16 +7,14 @@
 # package are under the same license as the package itself.
 #
 
-# norootforbuild
-
 Name:          spacenavd
 Version:       0.6
 Release:       0
-Summary:       Daemon for 3D connexion devices
+Summary:       Daemon for 3Dconnexion devices
 Group:         Hardware/Other
 License:       GPL-3.0+
 URL:           http://spacenav.sourceforge.net
-Source:        %{name}-%{version}.tar.gz
+Source:        http://downloads.sf.net/spacenav/%{name}-%{version}.tar.gz
 Source1:       spacenavd.8.gz
 Source2:       spnavrc
 Source3:       xinitrc-%{name}
@@ -26,28 +24,23 @@ BuildRequires: xorg-x11
 BuildRequires: xorg-x11-devel
 Requires:      xdpyinfo
 %if 0%{?suse_version} > 1140
-BuildRequires: pkgconfig(systemd)
+BuildRequires:  systemd-rpm-macros
 %{?systemd_requires}
 %define has_systemd 1
 %endif
 
 %description
-Spacenavd is a free software replacement user-space driver (daemon), for
-3Dconnexion's space-something 6dof input devices. It's compatible with the
-original 3dxsrv proprietary daemon provided by 3Dconnexion, and works perfectly
-with any program that was written foSpacenavd, is a free software replacement
-user-space driver (daemon), for 3Dconnexion's space-something 6dof input devices.
-It's compatible with the original 3dxsrv proprietary daemon provided by 3Dconnexion,
-and works perfectly with any program that was written for the 3Dconnexion driver.
- 
-For more info on the spacenav project, visit: http://spacenav.sourceforge.net
+Spacenavd is a free software replacement user-space driver (daemon)
+for 3Dconnexion's 6-degree-of-freedoms input devices. It is
+compatible with the original 3dxsrv daemon, and works perfectly with
+any program that was written for the 3Dconnexion driver.
  
 %prep  
 %setup -q
 
 %build
 %configure
-%__make opt="$RPM_OPT_FLAGS"
+make opt="%optflags"
 
 %install
 install -D -m 755 %{name} %{buildroot}%{_sbindir}/%{name}
@@ -68,10 +61,11 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service
 %endif
 
 %postun
-%restart_on_update %{name}
-%insserv_cleanup
 %if 0%{?has_systemd}
 %service_del_postun %{name}.service
+%else
+%restart_on_update %{name}
+%insserv_cleanup
 %endif
 
 %pre
@@ -80,9 +74,10 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service
 %endif
 
 %preun
-%stop_on_removal %{name}
 %if 0%{?has_systemd}
 %service_del_preun %{name}.service
+%else
+%stop_on_removal %{name}
 %endif
 
 %files
@@ -97,6 +92,6 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service
 %endif
 %{_mandir}/man8/spacenavd.8.gz
 %{_mandir}/man8/spnavd_ctl.8.gz
-%{_sysconfdir}/X11/xinit/xinitrc.d/spacenavd
+%{_sysconfdir}/X11/xinit/
 
 %changelog