diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/consolekit b/profiles/templates/3.1/2_ac_install_merge/Depends/consolekit
index e36801db5..23f03a174 100644
--- a/profiles/templates/3.1/2_ac_install_merge/Depends/consolekit
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/consolekit
@@ -1 +1 @@
-# Calculate append=skip merge(sys-auth/consolekit)!= merge=sys-auth/pambase
+# Calculate append=skip merge(sys-auth/consolekit)!= merge=sys-auth/pambase,sys-apps/shadow
diff --git a/profiles/templates/3.1/2_ac_install_merge/sys-apps/shadow/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/sys-apps/shadow/.calculate_directory
new file mode 100644
index 000000000..8e56a4caf
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/sys-apps/shadow/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate merge()!=&&pkg()!= path=/etc name=pam.d
+
diff --git a/profiles/templates/3.1/2_ac_install_merge/sys-auth/pambase/su b/profiles/templates/3.1/2_ac_install_merge/sys-apps/shadow/su
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/sys-auth/pambase/su
rename to profiles/templates/3.1/2_ac_install_merge/sys-apps/shadow/su