diff --git a/debian/changelog b/debian/changelog
index 390adf2..7f242d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ raspi-config (20200109) UNRELEASED; urgency=medium
   * Handle cases where SUDO_USER is unset
   * Fix VNC options
   * Install required packages when changing GL settings
+  * Add warning when enabling SSH
 
  -- Serge Schneider <serge@raspberrypi.org>  Thu, 09 Jan 2020 14:38:50 +0000
 
diff --git a/raspi-config b/raspi-config
index 56ac5e4..acc6cfb 100755
--- a/raspi-config
+++ b/raspi-config
@@ -758,7 +758,9 @@ do_ssh() {
     DEFAULT=
   fi
   if [ "$INTERACTIVE" = True ]; then
-    whiptail --yesno "Would you like the SSH server to be enabled?" $DEFAULT 20 60 2
+    whiptail --yesno \
+      "Would you like the SSH server to be enabled?\n\nCaution: Default and weak passwords are a security risk when SSH is enabled!" \
+      $DEFAULT 20 60 2
     RET=$?
   else
     RET=$1