diff --git a/conf/distro/include/angstrom-core-tweaks.inc b/conf/distro/include/angstrom-core-tweaks.inc
index 1f0cd41..53e497f 100644
--- a/conf/distro/include/angstrom-core-tweaks.inc
+++ b/conf/distro/include/angstrom-core-tweaks.inc
@@ -36,7 +36,7 @@ MACHINEOVERRIDES[vardepsexclude] += "SOC_FAMILY"
 
 # opkg
 PREFERRED_PROVIDER_opkg-collateral = "angstrom-feed-configs"
-EXTRA_IMAGE_FEATURES ?= "package-management"
+EXTRA_IMAGE_FEATURES ?= "package-management empty-root-password"
 
 PREFERRED_PROVIDER_os-release = "angstrom-version"
 
diff --git a/recipes-tweaks/pam/libpam_1.1.6.bbappend b/recipes-tweaks/pam/libpam_1.1.6.bbappend
deleted file mode 100644
index aa8e1a3..0000000
--- a/recipes-tweaks/pam/libpam_1.1.6.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-#allow empty password
-do_install_append () {
-	sed -i -e 's:nullok_secure:nullok:g' ${D}${sysconfdir}/pam.d/common-auth
-}