diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 78f9f9adbd..e545c425ab 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -105,6 +105,13 @@ do_install() {
  -e 's,@BINDIR@,${bindir},g' \
  -e 's,@SBINDIR@,${sbindir},g' \
  ${D}${systemd_system_unitdir}/dropbear.socket ${D}${systemd_system_unitdir}/*.service
+
+    # Enable root login for dropbear when debug-tweaks or allow-root-login are set
+    if [ "${@bb.utils.filter('EXTRA_IMAGE_FEATURES', 'debug-tweaks', d)}" \
+         || "${@bb.utils.filter('EXTRA_IMAGE_FEATURES', 'allow-root-login', d)}" ]; then
+            sed -i 's/-w//g' ${D}/etc/default/dropbear
+    fi
+
 }

 inherit update-alternatives