diff --git a/conf/Makefile b/conf/Makefile
index e8f88ec..adc9896 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -88,10 +88,16 @@ install-data:
 	done
 	-if test x$(PAMDIR) != x; then \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
-		if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
+		if test -f /etc/pam.d/password-auth; then \
+			$(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \
+		elif test -f /etc/pam.d/system-auth; then \
+			$(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \
 		else \
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
+			if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
+				$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
+			else \
+				$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
+			fi ; \
 		fi ; \
 	fi
 
diff --git a/conf/cups.password-auth b/conf/cups.password-auth
new file mode 100644
index 0000000..9943b0d
--- /dev/null
+++ b/conf/cups.password-auth
@@ -0,0 +1,4 @@
+#%PAM-1.0
+# Use password-auth common PAM configuration for the daemon
+auth        include     password-auth
+account     include     password-auth
diff --git a/conf/cups.system-auth b/conf/cups.system-auth
new file mode 100644
index 0000000..658583d
--- /dev/null
+++ b/conf/cups.system-auth
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth	include		system-auth
+account	include		system-auth