diff --git a/xlockmore.older-passwd.patch b/xlockmore.older-passwd.patch
new file mode 100644
index 0000000..8816113
--- /dev/null
+++ b/xlockmore.older-passwd.patch
@@ -0,0 +1,22 @@
+--- xlockmore-5.18/xlock/passwd.c	2005-05-31 15:54:36.000000000 +0200
++++ xlockmore-5.16/xlock/passwd.c	2005-02-17 02:24:50.000000000 +0100
+@@ -1218,15 +1208,10 @@
+ #ifdef BAD_PAM
+ 	(void) seteuid(ruid); /* back to user's privileges */
+ #endif
+-
+-	pam_error = pam_acct_mgmt(pamh, 0);
+-	if (pam_error == PAM_NEW_AUTHTOK_REQD)
+-		pam_error = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
+-	PAM_BAIL;
+-
+-	pam_error = pam_setcred(pamh, PAM_REINITIALIZE_CRED);
+-	PAM_BAIL;
+-
++	/* Do not do account management or credentials; credentials
++	 * are not needed and account management would just lock up
++	 * a computer and require root to come and unlock it.  Blech.
++	 */
+ 	pam_end(pamh, PAM_SUCCESS);
+ 	/* If this point is reached, the user has been authenticated. */
+ 	done = True;
diff --git a/xlockmore.spec b/xlockmore.spec
index 7ce0740..c9e7291 100644
--- a/xlockmore.spec
+++ b/xlockmore.spec
@@ -1,11 +1,12 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
 Version: 5.18
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
+Patch0: xlockmore.older-passwd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
@@ -33,6 +34,7 @@ GTK based frontend for xlockmore.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
@@ -104,6 +106,9 @@ desktop-file-install \
 %{_bindir}/xglock
 
 %changelog
+* Mon Jun 27 2005 Adrian Reber <adrian@lisas.de> - 5.18-3
+- included patch to make it work again with PAM (BZ #161740)
+
 * Fri Jun 17 2005 Adrian Reber <adrian@lisas.de> - 5.18-2
 - update to 5.18