diff --git a/debian/changelog b/debian/changelog
index 2a5d89e..96a4d97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+raspi-config (20170619) stretch; urgency=medium
+
+  * Start service on all runlevels
+
+ -- Serge Schneider <serge@raspberrypi.org>  Mon, 19 Jun 2017 09:14:40 +0000
+
 raspi-config (20170518) jessie; urgency=medium
 
   * Improve x86 splash screen command line handling to remove spurious arguments and spaces
diff --git a/debian/raspi-config.init b/debian/raspi-config.init
index 8caecb0..886273b 100644
--- a/debian/raspi-config.init
+++ b/debian/raspi-config.init
@@ -3,7 +3,7 @@
 # Provides:          raspi-config
 # Required-Start: udev mountkernfs $remote_fs
 # Required-Stop:
-# Default-Start: S
+# Default-Start: S 2 3 4 5
 # Default-Stop:
 # Short-Description: Switch to ondemand cpu governor (unless shift key is pressed)
 # Description:
diff --git a/debian/raspi-config.postinst b/debian/raspi-config.postinst
index 1ee3191..8f6eae1 100644
--- a/debian/raspi-config.postinst
+++ b/debian/raspi-config.postinst
@@ -4,4 +4,8 @@ if [ -e /etc/init.d/switch_cpu_governor ]; then
   update-rc.d switch_cpu_governor remove >/dev/null
 fi
 
+if dpkg --compare-versions "${2}" lt-nl "20170619"; then
+  update-rc.d -f raspi-config remove
+fi
+
 #DEBHELPER#