diff --git a/debian/changelog b/debian/changelog
index 1cbed3f..02bfc1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,14 @@
 raspi-config (20170714) stretch; urgency=medium
 
+  [Simon Long]
   * Autologin operations now all use current user rather than defaulting to pi
   * initd support removed
-
- -- Simon Long <simon@raspberrypi.org>  Fri, 14 Jul 2017 10:26:23 +0100
-
-raspi-config (20170712) stretch; urgency=medium
-
+  [Serge Schneider]
   * Add pi model as backtitle
   * Define memory split units
+  * Fix NOOBS config keyboard setup
 
- -- Serge Schneider <serge@raspberrypi.org>  Tue, 11 Jul 2017 12:20:26 +0100
+ -- Serge Schneider <serge@raspberrypi.org>  Fri, 14 Jul 2017 12:34:21 +0100
 
 raspi-config (20170711) stretch; urgency=medium
 
diff --git a/raspi-config b/raspi-config
index a887fd8..bd8ee85 100755
--- a/raspi-config
+++ b/raspi-config
@@ -1342,7 +1342,8 @@ EOF
     printf "Setting keyboard layout to %s based on os_config.json from NOOBS. May take a while\n" "$NOOBSKEYBOARD"
     sed -i /etc/default/keyboard -e "s/^XKBLAYOUT.*/XKBLAYOUT=\"$NOOBSKEYBOARD\"/"
     dpkg-reconfigure -f noninteractive keyboard-configuration
-    invoke-rc.d keyboard-setup start
+    setupcon -k --force
+    udevadm trigger -p ID_INPUT_KEY=1
   fi
   return 0
 }