diff --git a/JeOS.kiwi b/JeOS.kiwi
index b59f2ea..d2350eb 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -187,6 +187,9 @@
         <package name="dracut"/>
         <package name="fipscheck"/>
         <package name="group(mail)"/> <!-- needed by useradd bsc#1061838-->
+        <!-- Previously pam_cracklib was part of pam, but the replacement is only recommended -->
+        <package name="pam_pwquality"/>
+        <package name="cracklib-dict-small"/> <!-- Avoid the big 10MiB one -->
         <package name="iputils"/>
         <package name="issue-generator"/> <!-- bsc#1084879 -->
         <package name="vim-small"/>
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 83a9622..0445468 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 11 07:34:51 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Add pam_pwquality
+
 -------------------------------------------------------------------
 Wed Sep  2 10:00:36 UTC 2020 - Fabian Vogt <fvogt@suse.com>