diff --git a/raspi-config b/raspi-config
index 2923da4..0ddb97f 100755
--- a/raspi-config
+++ b/raspi-config
@@ -680,6 +680,22 @@ do_i2c() {
   modprobe i2c-dev
 }
 
+get_serial() {
+  if ! grep -q "ttyAMA" /proc/cmdline ; then
+    if ! grep -q -E "^enable_uart=1" $CONFIG; then
+      echo 1
+    else
+      echo 0
+    fi
+  else
+    if ! grep -q -E "^enable_uart=0" $CONFIG; then
+      echo 0
+    else
+      echo 1
+    fi
+  fi
+}
+
 do_serial() {
   DEFAULT=
   CUR_SERIAL=$(get_serial)