diff --git a/debian/changelog b/debian/changelog
index f9eb3665..5d8908b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ kano-updater (4.0.0-0) unstable; urgency=low
   * Bump version for Kano OS v4.0.0 "Hopper"
   * Fix GTK compatibility for Stretch release
   * Add support for CKT
+  * Disable newer audio driver with audio_pwm_mode=1 in config.txt
 
- -- Team Kano <dev@kano.me>  Thu, 23 Apr 2018 11:48:00 +0100
+ -- Team Kano <dev@kano.me>  Fri, 22 Jun 2018 11:48:00 +0100
 
 kano-updater (3.15.0-0) unstable; urgency=low
 
diff --git a/kano_updater/scenarios.py b/kano_updater/scenarios.py
index 7a47a718..3930f21c 100644
--- a/kano_updater/scenarios.py
+++ b/kano_updater/scenarios.py
@@ -973,8 +973,9 @@ def beta_3_13_0_to_beta_3_14_0(self):
             if c['rpi-chromium-mods-kano'].installed >= '20170809':
                 install('scratch2')
             else:
-                logger.error("beta_3_13_0_to_beta_3_14_0: wrong version of rpi-chromium-mods-kano installed: {}".format(
-                             c['rpi-chromium-mods-kano'].installed.version)
+                logger.error(
+                    "beta_3_13_0_to_beta_3_14_0: wrong version of rpi-chromium-mods-kano installed: {}"
+                    .format(c['rpi-chromium-mods-kano'].installed.version)
                 )
         except Exception as e:
             logger.error("beta_3_13_0_to_beta_3_14_0: Failed to install scratch2", exception=e)
@@ -986,4 +987,15 @@ def beta_3_14_1_to_beta_3_15_0(self):
         pass
 
     def beta_3_15_0_to_beta_4_0_0(self):
-        pass
+        try:
+            from textwrap import dedent
+            extra_config = dedent("""
+            # Disable the new audio pwm driver to avoid the risk of a kernel / firmware crash.
+            # https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=195178
+            # https://github.com/raspberrypi/linux/issues/2587
+            audio_pwm_mode=1
+            """)
+            self._add_boot_config_options(extra_config)
+
+        except Exception as e:
+            logger.error("Failed to update config: {}".format(e))