diff --git a/recipes-extra/gpsd/gpsd/gpsd b/recipes-extra/gpsd/gpsd/gpsd
index ba73daf..d4ec051 100755
--- a/recipes-extra/gpsd/gpsd/gpsd
+++ b/recipes-extra/gpsd/gpsd/gpsd
@@ -70,7 +70,7 @@ do_stop()
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Many daemons don't delete their pidfiles when they exit.
diff --git a/recipes-extra/gpsd/gpsd_3.7.bb b/recipes-extra/gpsd/gpsd_3.7.bb
index 18314c9..0f5307c 100644
--- a/recipes-extra/gpsd/gpsd_3.7.bb
+++ b/recipes-extra/gpsd/gpsd_3.7.bb
@@ -8,7 +8,7 @@ PROVIDES = "virtual/gpsd"
 
 EXTRANATIVEPATH += "chrpath-native"
 
-PR = "r3.5"
+PR = "r3.6"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \