diff --git a/debian/patches/Relax-usernames-groupnames-checking.patch b/debian/patches/Relax-usernames-groupnames-checking.patch
index bb3c0270..8e00d436 100644
--- a/debian/patches/Relax-usernames-groupnames-checking.patch
+++ b/debian/patches/Relax-usernames-groupnames-checking.patch
@@ -20,8 +20,8 @@ Gbp-Topic: debian
 ---
  lib/chkname.c      | 47 +++++++++++++++--------------------------------
  man/groupadd.8.xml |  6 ++++++
- man/useradd.8.xml  |  7 ++++++-
- 3 files changed, 27 insertions(+), 33 deletions(-)
+ man/useradd.8.xml  |  8 ++++++++
+ 3 files changed, 29 insertions(+), 32 deletions(-)
 
 diff --git a/lib/chkname.c b/lib/chkname.c
 index 995562f..d9678c6 100644
@@ -105,20 +105,21 @@ index 61a548f..d472bd0 100644
         Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long.
       </para>
 diff --git a/man/useradd.8.xml b/man/useradd.8.xml
-index 17987a6..4fc95d1 100644
+index 17987a6..c98b214 100644
 --- a/man/useradd.8.xml
 +++ b/man/useradd.8.xml
-@@ -733,7 +733,12 @@
-       the <command>ls</command> output.
-     </para>
+@@ -735,6 +735,14 @@
      <para>
--      Usernames may only be up to 256 characters long.
+       Usernames may only be up to 256 characters long.
+     </para>
++    <para>
 +      On Debian, the only constraints are that usernames must neither start
 +      with a dash ('-') nor plus ('+') nor tilde ('~') nor contain a
 +      colon (':'), a comma (','), or a whitespace (space: ' ',
 +      end of line: '\n', tabulation: '\t', etc.). Note that using a slash
 +      ('/') may break the default algorithm for the definition of the
 +      user's home directory.
-     </para>
++    </para>
    </refsect1>
  
+   <refsect1 id='configuration'>
diff --git a/debian/patches/ccpw-add-selinux-support.patch b/debian/patches/cppw-add-selinux-support.patch
similarity index 98%
rename from debian/patches/ccpw-add-selinux-support.patch
rename to debian/patches/cppw-add-selinux-support.patch
index d64210fa..0e0566db 100644
--- a/debian/patches/ccpw-add-selinux-support.patch
+++ b/debian/patches/cppw-add-selinux-support.patch
@@ -1,6 +1,6 @@
 From: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
 Date: Sat, 22 Jun 2024 17:39:41 +0200
-Subject: ccpw: add selinux support
+Subject: cppw: add selinux support
 
 Status wrt upstream: cppw is not available upstream.
 Needs to be reviewed by an SE-Linux aware person.
diff --git a/debian/patches/series b/debian/patches/series
index d4bee877..6708957b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 cppw-Add-tool.patch
-ccpw-add-selinux-support.patch
+cppw-add-selinux-support.patch
 Let-pam_unix-handle-login-failure-delays.patch
 Set-group-and-mode-for-g-shadow-files.patch
 Keep-using-Debian-adduser-defaults.patch
diff --git a/debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch b/debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch
index 74b41c86..beba4b0b 100644
--- a/debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch
+++ b/debian/patches/useradd-accept-the-O-flag-for-backward-compatibility.patch
@@ -14,7 +14,7 @@ Gbp-Topic: debian
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/man/useradd.8.xml b/man/useradd.8.xml
-index 4fc95d1..c513e56 100644
+index c98b214..20618bc 100644
 --- a/man/useradd.8.xml
 +++ b/man/useradd.8.xml
 @@ -333,6 +333,11 @@