diff --git a/pam.changes b/pam.changes
index 4f8e09a..7dd6086 100644
--- a/pam.changes
+++ b/pam.changes
@@ -1,10 +1,11 @@
 -------------------------------------------------------------------
 Fri Jan 19 09:11:30 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
 
-- Add post 1.6.0 release fixes for pam_env:
+- Add post 1.6.0 release fixes for pam_env and pam_unix:
   - pam_env-fix-enable-vendordir-fallback.patch
   - pam_env-fix_vendordir.patch
   - pam_env-remove-escaped-newlines.patch
+  - pam_unix-fix-password-aging-disabled.patch
 - Update to version 1.6.0
   - Added support of configuration files with arbitrarily long lines.
   - build: fixed build outside of the source tree.
diff --git a/pam.spec b/pam.spec
index fa47dab..a0249b5 100644
--- a/pam.spec
+++ b/pam.spec
@@ -102,6 +102,8 @@ Patch2:         pam_env-fix_vendordir.patch
 Patch3:		pam_env-fix-enable-vendordir-fallback.patch
 # https://github.com/linux-pam/linux-pam/pull/741
 Patch4:         pam_env-remove-escaped-newlines.patch
+# https://github.com/linux-pam/linux-pam/pull/744
+Patch5:         pam_unix-fix-password-aging-disabled.patch
 BuildRequires:  audit-devel
 BuildRequires:  bison
 BuildRequires:  flex
@@ -217,6 +219,7 @@ cp -a %{SOURCE12} .
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 bash ./pam-login_defs-check.sh
diff --git a/pam_unix-fix-password-aging-disabled.patch b/pam_unix-fix-password-aging-disabled.patch
new file mode 100644
index 0000000..53f2793
--- /dev/null
+++ b/pam_unix-fix-password-aging-disabled.patch
@@ -0,0 +1,27 @@
+From 9d40f55216b2de60ccb9b617c79b9280b9f29ead Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Fri, 19 Jan 2024 10:09:00 +0100
+Subject: [PATCH] pam_unix: do not warn if password aging disabled
+
+Later checks will print a warning if daysleft is 0. If password
+aging is disabled, leave daysleft at -1.
+
+Fixes 9ebc14085a3ba253598cfaa0d3f0d76ea5ee8ccb.
+
+Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
+---
+ modules/pam_unix/passverify.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c
+index 5c4f862e7..1bc98fa25 100644
+--- a/modules/pam_unix/passverify.c
++++ b/modules/pam_unix/passverify.c
+@@ -314,7 +314,6 @@ PAMH_ARG_DECL(int check_shadow_expiry,
+ 	}
+ 	if (spent->sp_lstchg < 0) {
+ 		D(("password aging disabled"));
+-		*daysleft = 0;
+ 		return PAM_SUCCESS;
+ 	}
+ 	if (curdays < spent->sp_lstchg) {