diff -Nru gpsd-3.16/debian/changelog gpsd-3.16/debian/changelog
--- gpsd-3.16/debian/changelog	2016-04-30 18:07:25.000000000 +0000
+++ gpsd-3.16/debian/changelog	2016-05-15 13:35:27.000000000 +0000
@@ -1,3 +1,14 @@
+gpsd (3.16-2) unstable; urgency=medium
+
+  * [5001c11a] Do not start gpsd.service by default.
+    We use socket based activation only.
+    If one needs a running gpsd.service at boot - without being started by
+    gpsd.socket - you'll have to configure systemd to start it.
+    Too many people have gpsd installed as dependency and do not need yet
+    another running process.
+
+ -- Bernd Zeimetz <bzed@debian.org>  Sun, 15 May 2016 15:35:20 +0200
+
 gpsd (3.16-1) unstable; urgency=medium
 
   * [c3d16637] Merge tag 'upstream/3.16'
diff -Nru gpsd-3.16/debian/patches/full-systemd-support gpsd-3.16/debian/patches/full-systemd-support
--- gpsd-3.16/debian/patches/full-systemd-support	2016-04-30 18:07:25.000000000 +0000
+++ gpsd-3.16/debian/patches/full-systemd-support	2016-05-15 13:35:27.000000000 +0000
@@ -1,6 +1,6 @@
 --- a/systemd/gpsd.service
 +++ b/systemd/gpsd.service
-@@ -6,8 +6,7 @@ After=chronyd.service
+@@ -6,9 +6,7 @@ After=chronyd.service
  
  [Service]
  EnvironmentFile=-/etc/default/gpsd
@@ -9,4 +9,5 @@
 +ExecStart=/usr/sbin/gpsd -N $GPSD_OPTIONS $DEVICES
  
  [Install]
- WantedBy=multi-user.target
+-WantedBy=multi-user.target
+ Also=gpsd.socket