diff --git a/debian/changelog b/debian/changelog
index 46bbc21..ea376d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+raspi-config (20170811) stretch; urgency=medium
+
+  * Enable and disable pigpiod daemon with remote access
+
+ -- Simon Long <simon@raspberrypi.org>  Fri, 11 Aug 2017 14:40:50 +0100
+
 raspi-config (20170803) stretch; urgency=medium
 
   * Allow splash screen with fake KMS.
diff --git a/raspi-config b/raspi-config
index a70d6f9..1baf061 100755
--- a/raspi-config
+++ b/raspi-config
@@ -990,15 +990,19 @@ do_rgpio() {
 ExecStart=
 ExecStart=/usr/bin/pigpiod
 EOF
+    systemctl daemon-reload
+    systemctl restart pigpiod
+    systemctl enable pigpiod
     STATUS=enabled
   elif [ $RET -eq 1 ]; then
     rm -f /etc/systemd/system/pigpiod.service.d/public.conf
+    systemctl daemon-reload
+    systemctl stop pigpiod
+    systemctl disable pigpiod
     STATUS=disabled
   else
     return $RET
   fi
-  systemctl daemon-reload
-  systemctl restart pigpiod
   if [ "$INTERACTIVE" = True ]; then
     whiptail --msgbox "Remote access to the GPIO server is $STATUS" 20 60 1
   fi
@@ -1449,7 +1453,7 @@ do_interface_menu() {
       "P5 I2C" "Enable/Disable automatic loading of I2C kernel module" \
       "P6 Serial" "Enable/Disable shell and kernel messages on the serial connection" \
       "P7 1-Wire" "Enable/Disable one-wire interface" \
-      "P8 Remote GPIO" "Enable/Disable remote access to GPIO pins" \
+      "P8 GPIO Server" "Enable/Disable remote access to GPIO pins" \
       3>&1 1>&2 2>&3)
     RET=$?
     if [ $RET -eq 1 ]; then