diff --git a/shadow-4.15.0-account-tools-setuid.patch b/shadow-4.15.0-account-tools-setuid.patch
index d162487..5ab6406 100644
--- a/shadow-4.15.0-account-tools-setuid.patch
+++ b/shadow-4.15.0-account-tools-setuid.patch
@@ -1,82 +1,3 @@
-diff -up shadow-4.15.0/src/chpasswd.c.account-tools-setuid shadow-4.15.0/src/chpasswd.c
---- shadow-4.15.0/src/chpasswd.c.account-tools-setuid	2024-03-08 22:27:04.000000000 +0100
-+++ shadow-4.15.0/src/chpasswd.c	2024-03-11 11:21:57.561150382 +0100
-@@ -443,9 +443,11 @@ int main (int argc, char **argv)
- 	char *cp;
- 	const char *salt;
- 
-+#ifdef ACCT_TOOLS_SETUID
- #ifdef USE_PAM
- 	bool use_pam = true;
- #endif				/* USE_PAM */
-+#endif /* ACCT_TOOLS_SETUID */
- 
- 	int errors = 0;
- 	int line = 0;
-@@ -469,19 +471,23 @@ int main (int argc, char **argv)
- 	process_root_flag ("-R", argc, argv);
- 	prefix = process_prefix_flag ("-P", argc, argv);
- 
-+#ifdef ACCT_TOOLS_SETUID
- #ifdef USE_PAM
- 	if (md5flg || eflg || cflg || prefix[0]) {
- 		use_pam = false;
- 	}
- #endif				/* USE_PAM */
-+#endif /* ACCT_TOOLS_SETUID */
- 
- 	OPENLOG (Prog);
- 
- 	check_perms ();
- 
-+#ifdef ACCT_TOOLS_SETUID
- #ifdef USE_PAM
- 	if (!use_pam)
- #endif				/* USE_PAM */
-+#endif /* ACCT_TOOLS_SETUID */
- 	{
- 		is_shadow_pwd = spw_file_present ();
- 
-@@ -543,6 +549,7 @@ int main (int argc, char **argv)
- 		}
- 		newpwd = cp;
- 
-+#ifdef ACCT_TOOLS_SETUID
- #ifdef USE_PAM
- 		if (use_pam) {
- 			if (do_pam_passwd_non_interactive (Prog, name, newpwd) != 0) {
-@@ -553,6 +560,7 @@ int main (int argc, char **argv)
- 			}
- 		} else
- #endif				/* USE_PAM */
-+#endif /* ACCT_TOOLS_SETUID */
- 		{
- 		const struct spwd *sp;
- 		struct spwd newsp;
-@@ -672,9 +680,11 @@ int main (int argc, char **argv)
- 	 * password database.
- 	 */
- 	if (0 != errors) {
-+#ifdef ACCT_TOOLS_SETUID
- #ifdef USE_PAM
- 		if (!use_pam)
- #endif				/* USE_PAM */
-+#endif /* ACCT_TOOLS_SETUID */
- 		{
- 			fprintf (stderr,
- 			         _("%s: error detected, changes ignored\n"),
-@@ -683,9 +693,11 @@ int main (int argc, char **argv)
- 		fail_exit (1);
- 	}
- 
-+#ifdef ACCT_TOOLS_SETUID
- #ifdef USE_PAM
- 	if (!use_pam)
- #endif				/* USE_PAM */
-+#endif /* ACCT_TOOLS_SETUID */
- 	{
- 	/* Save the changes */
- 		close_files ();
 diff -up shadow-4.15.0/src/groupmems.c.account-tools-setuid shadow-4.15.0/src/groupmems.c
 --- shadow-4.15.0/src/groupmems.c.account-tools-setuid	2024-03-08 22:27:04.000000000 +0100
 +++ shadow-4.15.0/src/groupmems.c	2024-03-11 11:16:18.365408572 +0100
diff --git a/shadow-utils.spec b/shadow-utils.spec
index c361429..53fe61b 100644
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.15.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 2
 License: BSD-3-Clause AND GPL-2.0-or-later
 URL: https://github.com/shadow-maint/shadow
@@ -295,6 +295,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.a
 %{_libdir}/libsubid.so
 
 %changelog
+* Thu May 30 2024 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.15.1-6
+- chpasswd: use PAM again (#2283963)
+
 * Mon May 20 2024 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.15.1-5
 - Several fixes for issues detected by static analyzer tools