diff --git a/debian/changelog b/debian/changelog
index 8445d3d..e727cfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+raspi-config (20200226) buster; urgency=medium
+
+  * Sync FKMS check with gldriver-test
+  * Fix is_pi check
+
+ -- Serge Schneider <serge@raspberrypi.org>  Wed, 26 Feb 2020 17:51:20 +0000
+
 raspi-config (20200207) buster; urgency=medium
 
   * Fix bug preventing VNC from being disabled
diff --git a/raspi-config b/raspi-config
index af16346..9659dfc 100755
--- a/raspi-config
+++ b/raspi-config
@@ -12,7 +12,7 @@ USER=${SUDO_USER:-$(who -m | awk '{ print $1 }')}
 
 is_pi () {
   ARCH=$(dpkg --print-architecture)
-  if [ "$ARCH" = "armhf" ] ; then
+  if [ "$ARCH" = "armhf" ] || [ "$ARCH" = "arm64" ] ; then
     return 0
   else
     return 1
@@ -74,7 +74,9 @@ is_ssh() {
 }
 
 is_fkms() {
-  if grep -q okay /proc/device-tree/soc/v3d@7ec00000/status 2> /dev/null || grep -q okay /proc/device-tree/soc/firmwarekms@7e600000/status 2> /dev/null ; then
+  if grep -s -q okay /proc/device-tree/soc/v3d@7ec00000/status \
+                     /proc/device-tree/soc/firmwarekms@7e600000/status \
+                     /proc/device-tree/v3dbus/v3d@7ec04000/status; then
     return 0
   else
     return 1