diff --git a/recipes-core/pam/libpam_%.bbappend b/recipes-core/pam/libpam_%.bbappend
deleted file mode 100644
index 65c608b..0000000
--- a/recipes-core/pam/libpam_%.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " file://pam.d/common-password \
-             file://pam.d/common-account \
-             file://pam.d/common-auth \
-            "
-
-RDEPENDS_${PN}-runtime += "${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \
-                           ${MLPREFIX}pam-plugin-tally2-${libpam_suffix} \
-                           ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \
-                          "
diff --git a/recipes-core/pam/libpam/pam.d/common-account b/recipes-extended/pam/libpam/pam.d/common-account
similarity index 100%
rename from recipes-core/pam/libpam/pam.d/common-account
rename to recipes-extended/pam/libpam/pam.d/common-account
diff --git a/recipes-core/pam/libpam/pam.d/common-auth b/recipes-extended/pam/libpam/pam.d/common-auth
similarity index 100%
rename from recipes-core/pam/libpam/pam.d/common-auth
rename to recipes-extended/pam/libpam/pam.d/common-auth
diff --git a/recipes-core/pam/libpam/pam.d/common-password b/recipes-extended/pam/libpam/pam.d/common-password
similarity index 100%
rename from recipes-core/pam/libpam/pam.d/common-password
rename to recipes-extended/pam/libpam/pam.d/common-password
diff --git a/recipes-extended/pam/libpam_%.bbappend b/recipes-extended/pam/libpam_%.bbappend
index 714496a..f97664f 100644
--- a/recipes-extended/pam/libpam_%.bbappend
+++ b/recipes-extended/pam/libpam_%.bbappend
@@ -1,3 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " file://pam.d/common-password \
+             file://pam.d/common-account \
+             file://pam.d/common-auth \
+            "
+
+RDEPENDS_${PN}-runtime += "${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \
+                           ${MLPREFIX}pam-plugin-tally2-${libpam_suffix} \
+                           ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \
+                          "
+
 do_install_append() {
     # The libpam recipe will always add a pam_systemd.so line to
     # common-session if systemd is enabled; however systemd only
diff --git a/recipes-core/pam/pam-ipmi_git.bb b/recipes-extended/pam/pam-ipmi_git.bb
similarity index 100%
rename from recipes-core/pam/pam-ipmi_git.bb
rename to recipes-extended/pam/pam-ipmi_git.bb