diff --git a/meta-google/recipes-extended/pam/libpam_%.bbappend b/meta-google/recipes-extended/pam/libpam_%.bbappend
index d57b0ea..3b35e56 100644
--- a/meta-google/recipes-extended/pam/libpam_%.bbappend
+++ b/meta-google/recipes-extended/pam/libpam_%.bbappend
@@ -1,20 +1,14 @@
-# Remove cracklib from PAM, to avoid breaking PAM and further dependencies
-# This allows cracklib to be neatly severed from the system.
+# Remove pwquality from PAM, to avoid breaking PAM and further dependencies
+# This allows pwquality to be neatly severed from the system.
 
-EXTRA_OECONF:append:gbmc = " --disable-cracklib"
-
-DEPENDS:remove:gbmc = "cracklib"
-
-RDEPENDS:${PN}-runtime:remove:gbmc = "pam-plugin-cracklib-suffix"
-
-RDEPENDS:${PN}-xtests:remove:gbmc = "${MLPREFIX}pam-plugin-cracklib-${libpam_suffix}"
+RDEPENDS:${PN}-runtime:remove:gbmc = "libpwquality"
 
 do_install:append:gbmc() {
-    # Remove reference to cracklib library from PAM config file
-    sed -i '/pam_cracklib.so/d' ${D}${sysconfdir}/pam.d/common-password
+    # Remove reference to pwquality library from PAM config file
+    sed -i '/pam_pwquality.so/d' ${D}${sysconfdir}/pam.d/common-password
 
     # Remove the first occurrence of "use_authtok" in the first line starting
-    # with "password". This makes sure that if pam_cracklib.so was the first
+    # with "password". This makes sure that if pam_pwquality.so was the first
     # entry, we didn't invalidate the next entry in the stack. If the first
     # entry has the "use_authtok" set, this "forces the module to not prompt
     # the user for a new password but use the one provided by the previously