diff --git a/debian/patches/401_cppw_src.dpatch b/debian/patches/401_cppw_src.patch
similarity index 87%
rename from debian/patches/401_cppw_src.dpatch
rename to debian/patches/401_cppw_src.patch
index 52447022..195281ff 100644
--- a/debian/patches/401_cppw_src.dpatch
+++ b/debian/patches/401_cppw_src.patch
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 401_cppw_src.dpatch by  Nicolas FRANCOIS <nicolas.francois@centraliens.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add cppw / cpgr
+# 401_cppw_src.patch by  Nicolas FRANCOIS <nicolas.francois@centraliens.net>
 
-@DPATCH@
+Index: shadow/src/cppw.c
+===================================================================
 --- /dev/null
-+++ b/src/cppw.c
++++ shadow/src/cppw.c
 @@ -0,0 +1,238 @@
 +/*
 +  cppw, cpgr  copy with locking given file over the password or group file
@@ -246,9 +243,11 @@
 +	return 0;
 +}
 +
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -34,6 +34,7 @@
+Index: shadow/src/Makefile.am
+===================================================================
+--- shadow.orig/src/Makefile.am
++++ shadow/src/Makefile.am
+@@ -39,6 +39,7 @@ if WITH_SU
  bin_PROGRAMS  += su
  endif
  usbin_PROGRAMS = \
@@ -256,17 +255,19 @@
  	chgpasswd \
  	chpasswd \
  	groupadd \
-@@ -102,6 +103,7 @@
+@@ -104,6 +105,7 @@ newuidmap_LDADD    = $(LDADD) $(LIBAUDIT
+ newgidmap_LDADD    = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCAP) $(LIBECONF) -ldl
+ chfn_LDADD     = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) $(LIBECONF)
  chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF)
++cppw_LDADD     = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
  chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) $(LIBECONF)
- chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF)
-+cppw_LDADD     = $(LDADD) $(LIBSELINUX) $(LIBAUDIT)
+ chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF) -ldl
  expiry_LDADD = $(LDADD) $(LIBECONF)
- gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF)
- groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) -ldl
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -91,6 +91,7 @@
+Index: shadow/po/POTFILES.in
+===================================================================
+--- shadow.orig/po/POTFILES.in
++++ shadow/po/POTFILES.in
+@@ -87,6 +87,7 @@ src/chfn.c
  src/chgpasswd.c
  src/chpasswd.c
  src/chsh.c
diff --git a/debian/patches/series b/debian/patches/series
index 138c3bf0..7175e82c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
 #900_testsuite_groupmems
 #901_testsuite_gcov
 
-401_cppw_src.dpatch
+401_cppw_src.patch
 # 402 should be merged in 401, but should be reviewed by SE Linux experts first
 402_cppw_selinux
 429_login_FAILLOG_ENAB