diff --git a/debian/changelog b/debian/changelog
index 87fa318..bec4caf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+raspi-config (20210924) bullseye; urgency=medium
+
+  * Remove fake KMS option
+
+ -- Simon Long <simon@raspberrypi.com>  Fri, 24 Sep 2021 14:32:52 +0100
+
 raspi-config (20210922) bullseye; urgency=medium
 
   * Handle 73-usb-net-by-mac.link when toggling network names
diff --git a/raspi-config b/raspi-config
index b12a996..b9cac44 100755
--- a/raspi-config
+++ b/raspi-config
@@ -1770,52 +1770,21 @@ do_gldriver() {
     whiptail --msgbox "Required packages not found, please install: ${missing_packages}" 20 60 2
     return 1
   fi
-  if is_pifour ; then
   GLOPT=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "GL Driver" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT \
     "G1 Legacy" "Original non-GL desktop driver" \
-    "G2 GL (Fake KMS)" "OpenGL desktop driver with fake KMS" \
+    "G2 GL (Full KMS)" "OpenGL desktop driver with full KMS" \
     3>&1 1>&2 2>&3)
-  else
-  GLOPT=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "GL Driver" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT \
-    "G1 Legacy" "Original non-GL desktop driver" \
-    "G2 GL (Fake KMS)" "OpenGL desktop driver with fake KMS" \
-    "G3 GL (Full KMS)" "OpenGL desktop driver with full KMS" \
-    3>&1 1>&2 2>&3)
-  fi
   if [ $? -eq 0 ]; then
     case "$GLOPT" in
       G1*)
-        if is_pifour ; then
-          if grep -q -E "^dtoverlay=vc4-f?kms-v3d" $CONFIG; then
-            ASK_TO_REBOOT=1
-          fi
-        else
-          if sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q -E "^dtoverlay=vc4-f?kms-v3d" ; then
-            ASK_TO_REBOOT=1
-          fi
+        if sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q -E "^dtoverlay=vc4-f?kms-v3d" ; then
+          ASK_TO_REBOOT=1
         fi
-        sed $CONFIG -i -e "s/^dtoverlay=vc4-kms-v3d/#dtoverlay=vc4-kms-v3d/g"
         sed $CONFIG -i -e "s/^dtoverlay=vc4-fkms-v3d/#dtoverlay=vc4-fkms-v3d/g"
+        sed $CONFIG -i -e "s/^dtoverlay=vc4-kms-v3d/#dtoverlay=vc4-kms-v3d/g"
         STATUS="The GL driver is disabled."
         ;;
       G2*)
-        if is_pifour ; then
-          if ! grep -q -E "^dtoverlay=vc4-fkms-v3d" $CONFIG; then
-            ASK_TO_REBOOT=1
-          fi
-        else
-          if ! sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q "^dtoverlay=vc4-fkms-v3d" ; then
-            ASK_TO_REBOOT=1
-          fi
-        fi
-        sed $CONFIG -i -e "s/^dtoverlay=vc4-kms-v3d/#dtoverlay=vc4-kms-v3d/g"
-        sed $CONFIG -i -e "s/^#dtoverlay=vc4-fkms-v3d/dtoverlay=vc4-fkms-v3d/g"
-        if ! sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q "^dtoverlay=vc4-fkms-v3d" ; then
-          printf "[all]\ndtoverlay=vc4-fkms-v3d\n" >> $CONFIG
-        fi
-        STATUS="The fake KMS GL driver is enabled."
-        ;;
-      G3*)
         if ! sed -n "/\[pi4\]/,/\[/ !p" $CONFIG | grep -q "^dtoverlay=vc4-kms-v3d" ; then
           ASK_TO_REBOOT=1
         fi
@@ -2811,7 +2780,6 @@ do_advanced_menu() {
   if is_pifour ; then
     FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Advanced Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
       "A1 Expand Filesystem" "Ensures that all of the SD card is available" \
-      "A2 GL Driver" "Enable/disable experimental desktop GL driver" \
       "A3 Compositor" "Enable/disable xcompmgr composition manager" \
       "A4 Network Interface Names" "Enable/disable predictable network i/f names" \
       "A5 Network Proxy Settings" "Configure network proxy settings" \