diff --git a/fix.build.gcc11.patch b/fix.build.gcc11.patch
deleted file mode 100644
index 2a5c6ca..0000000
--- a/fix.build.gcc11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN Linux-PAM-1.6.1/doc/Makefile.am Linux-PAM-1.6.1-patched/doc/Makefile.am
---- Linux-PAM-1.6.1/doc/Makefile.am	2024-04-09 19:22:59.000000000 +0300
-+++ Linux-PAM-1.6.1-patched/doc/Makefile.am	2024-04-11 13:49:36.772917248 +0300
-@@ -2,7 +2,7 @@
- # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
- #
- 
--SUBDIRS = man specs sag adg mwg
-+SUBDIRS = man sag adg mwg
- 
- CLEANFILES = *~
- DISTCLEANFILES = custom-html.xsl custom-man.xsl
diff --git a/pam-1.6.0-noflex.patch b/pam-1.6.0-noflex.patch
deleted file mode 100644
index 2a5c6ca..0000000
--- a/pam-1.6.0-noflex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN Linux-PAM-1.6.1/doc/Makefile.am Linux-PAM-1.6.1-patched/doc/Makefile.am
---- Linux-PAM-1.6.1/doc/Makefile.am	2024-04-09 19:22:59.000000000 +0300
-+++ Linux-PAM-1.6.1-patched/doc/Makefile.am	2024-04-11 13:49:36.772917248 +0300
-@@ -2,7 +2,7 @@
- # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
- #
- 
--SUBDIRS = man specs sag adg mwg
-+SUBDIRS = man sag adg mwg
- 
- CLEANFILES = *~
- DISTCLEANFILES = custom-html.xsl custom-man.xsl
diff --git a/pam-1.6.0-redhat-modules.patch b/pam-1.6.0-redhat-modules.patch
index 54ab22a..66aa8ff 100644
--- a/pam-1.6.0-redhat-modules.patch
+++ b/pam-1.6.0-redhat-modules.patch
@@ -1,7 +1,7 @@
-diff -ruN a/configure.ac b/configure.ac
---- a/configure.ac	2024-01-17 19:29:36.000000000 +0900
-+++ b/configure.ac	2024-03-15 14:05:18.762704512 +0900
-@@ -774,6 +774,8 @@
+diff -up Linux-PAM-1.6.0/configure.ac.redhat-modules Linux-PAM-1.6.0/configure.ac
+--- Linux-PAM-1.6.0/configure.ac.redhat-modules	2024-01-23 13:16:34.854753145 +0100
++++ Linux-PAM-1.6.0/configure.ac	2024-01-23 13:17:52.855859922 +0100
+@@ -774,6 +774,8 @@ AC_CONFIG_FILES([Makefile libpam/Makefil
  	po/Makefile.in \
  	Make.xml.rules \
  	modules/Makefile \
@@ -10,10 +10,10 @@ diff -ruN a/configure.ac b/configure.ac
  	modules/pam_access/Makefile \
  	modules/pam_canonicalize_user/Makefile \
  	modules/pam_debug/Makefile modules/pam_deny/Makefile \
-diff -ruN a/modules/Makefile.am b/modules/Makefile.am
---- a/modules/Makefile.am	2024-01-17 19:29:36.000000000 +0900
-+++ b/modules/Makefile.am	2024-03-15 14:05:18.762704512 +0900
-@@ -48,6 +48,8 @@
+diff -up Linux-PAM-1.6.0/modules/Makefile.am.redhat-modules Linux-PAM-1.6.0/modules/Makefile.am
+--- Linux-PAM-1.6.0/modules/Makefile.am.redhat-modules	2024-01-17 11:29:36.000000000 +0100
++++ Linux-PAM-1.6.0/modules/Makefile.am	2024-01-23 13:16:34.855753147 +0100
+@@ -48,6 +48,8 @@ SUBDIRS := \
  	pam_debug \
  	pam_deny \
  	pam_echo \
diff --git a/pam-1.6.1-noflex.patch b/pam-1.6.1-noflex.patch
new file mode 100644
index 0000000..fa35dc7
--- /dev/null
+++ b/pam-1.6.1-noflex.patch
@@ -0,0 +1,24 @@
+diff -up Linux-PAM-1.6.1/doc/Makefile.am.noflex Linux-PAM-1.6.1/doc/Makefile.am
+--- Linux-PAM-1.6.1/doc/Makefile.am.noflex	2024-04-09 18:22:59.000000000 +0200
++++ Linux-PAM-1.6.1/doc/Makefile.am	2024-04-10 11:09:39.304086982 +0200
+@@ -2,7 +2,7 @@
+ # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
+ #
+ 
+-SUBDIRS = man specs sag adg mwg
++SUBDIRS = man sag adg mwg
+ 
+ CLEANFILES = *~
+ DISTCLEANFILES = custom-html.xsl custom-man.xsl
+diff -up Linux-PAM-1.6.1/Makefile.am.noflex Linux-PAM-1.6.1/Makefile.am
+--- Linux-PAM-1.6.1/Makefile.am.noflex	2024-04-10 11:09:39.304086982 +0200
++++ Linux-PAM-1.6.1/Makefile.am	2024-04-10 11:13:15.057352362 +0200
+@@ -4,7 +4,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-xz no-dist-gzip check-news
+ 
+-SUBDIRS = libpam_internal libpam tests libpamc libpam_misc modules po conf \
++SUBDIRS = libpam_internal libpam tests libpamc libpam_misc modules po doc \
+ 	  xtests
+ 
+ if HAVE_DOC
diff --git a/pam.spec b/pam.spec
index df8d1d4..ed4c691 100644
--- a/pam.spec
+++ b/pam.spec
@@ -42,7 +42,7 @@ Source502:	README
 
 # RedHat patches
 Patch1:		pam-1.6.0-redhat-modules.patch
-Patch9:		pam-1.6.0-noflex.patch
+Patch9:		pam-1.6.1-noflex.patch
 
 # Upstreamed partially
 Patch33:	https://src.fedoraproject.org/rpms/pam/raw/master/f/pam-1.3.0-unix-nomsg.patch