diff --git a/debian/changelog b/debian/changelog
index 8bf6ecc9..49587706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,11 @@ shadow (1:4.1.1~rc1-1) UNRELEASED; urgency=low
       + debian/patches/504_undef_USE_PAM.nolibpam
         $(LIBCRYPT) $(LIBSKEY) $(LIBMD) are no more included in libshadow.la.
         Avoid link to unneeded libraries (spotted by dpkg-shlibdeps).
+      + debian/patches/501_commonio_group_shadow
+      + debian/patches/429_login_FAILLOG_ENAB
+      + debian/patches/542_useradd-O_option
+      + debian/patches/401_cppw_src.dpatch
+      + debian/patches/428_grpck_add_prune_option
   * debian/watch: Add a watch file for shadow.
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>  Sun, 24 Feb 2008 18:33:31 +0100
diff --git a/debian/patches/401_cppw_src.dpatch b/debian/patches/401_cppw_src.dpatch
index e8a61e10..7ccdaf02 100755
--- a/debian/patches/401_cppw_src.dpatch
+++ b/debian/patches/401_cppw_src.dpatch
@@ -221,11 +221,11 @@ Index: shadow-4.1.0/src/Makefile.am
  	chpasswd \
  	groupadd \
 @@ -59,6 +60,7 @@
- chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
- chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX)
- chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+ chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
+ chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
+ chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
 +cppw_LDADD     = $(LDADD) $(LIBSELINUX)
- gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
+ gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT)
  groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
  groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
 Index: shadow-4.1.0/po/POTFILES.in
diff --git a/debian/patches/428_grpck_add_prune_option b/debian/patches/428_grpck_add_prune_option
index 57d49516..d97915d3 100644
--- a/debian/patches/428_grpck_add_prune_option
+++ b/debian/patches/428_grpck_add_prune_option
@@ -10,13 +10,13 @@ Index: shadow-4.1.0/src/grpck.c
 --- shadow-4.1.0.orig/src/grpck.c
 +++ shadow-4.1.0/src/grpck.c
 @@ -139,6 +139,7 @@
- 	int errors = 0;
- 	int changed = 0;
- 	int i;
-+	int prune = 0;
- 	struct commonio_entry *gre, *tgre;
- 	struct group *grp;
- 	int sort_mode = 0;
+ /* Options */
+ static int read_only = 0;
+ static int sort_mode = 0;
++static int prune = 0;
+ 
+ /* local function prototypes */
+ static void usage (void);
 @@ -163,7 +164,7 @@
  	/*
  	 * Parse the command line arguments
@@ -36,18 +36,19 @@ Index: shadow-4.1.0/src/grpck.c
  		default:
  			usage ();
  		}
-@@ -296,8 +300,13 @@
+@@ -296,9 +300,14 @@
  			/*
  			 * prompt the user to delete the entry or not
  			 */
--			if (!yes_or_no ())
+-			if (!yes_or_no (read_only)) {
 +			if (!prune) {
-+			        if (!yes_or_no ())
++			        if (!yes_or_no (read_only)) {
 +				        continue;
++				}
 +			} else {
-+			        puts (_("Yes"));
++				puts (_("Yes"));
  				continue;
-+			}
+ 			}
  
  			/*
  			 * All group file deletions wind up here. This code
diff --git a/debian/patches/429_login_FAILLOG_ENAB b/debian/patches/429_login_FAILLOG_ENAB
index 95b0681a..d4951fa4 100644
--- a/debian/patches/429_login_FAILLOG_ENAB
+++ b/debian/patches/429_login_FAILLOG_ENAB
@@ -11,15 +11,13 @@ Index: shadow-4.1.0/src/login.c
 ===================================================================
 --- shadow-4.1.0.orig/src/login.c
 +++ shadow-4.1.0/src/login.c
-@@ -130,11 +130,11 @@
+@@ -130,9 +130,9 @@
  static void setup_tty (void);
  static void check_flags (int, char *const *);
  
 +static struct faillog faillog;
 +
  #ifndef USE_PAM
- extern int login_access (const char *, const char *);
- 
 -static struct faillog faillog;
 -
  static void bad_time_notify (void);
diff --git a/debian/patches/501_commonio_group_shadow b/debian/patches/501_commonio_group_shadow
index ef5df94e..4ad8a34f 100644
--- a/debian/patches/501_commonio_group_shadow
+++ b/debian/patches/501_commonio_group_shadow
@@ -7,13 +7,13 @@ Index: shadow-4.1.0/lib/commonio.c
 --- shadow-4.1.0.orig/lib/commonio.c
 +++ shadow-4.1.0/lib/commonio.c
 @@ -13,6 +13,7 @@
+ #include <errno.h>
  #include <stdio.h>
  #include <signal.h>
- #include <pwd.h>
 +#include <grp.h>
- #include <nscd.h>
- #ifdef HAVE_SHADOW_H
- #include <shadow.h>
+ #include "nscd.h"
+ #ifdef WITH_SELINUX
+ #include <selinux/selinux.h>
 @@ -712,13 +713,20 @@
  			goto fail;
  		}
diff --git a/debian/patches/542_useradd-O_option b/debian/patches/542_useradd-O_option
index c36e0a8c..ab5e3288 100644
--- a/debian/patches/542_useradd-O_option
+++ b/debian/patches/542_useradd-O_option
@@ -29,8 +29,8 @@ Index: shadow-4.1.0/src/useradd.c
  			{NULL, 0, NULL, '\0'}
  		};
  		while ((c =
--			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:mMop:s:u:",
+-			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U",
++			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:lmMNop:rs:u:U",
  				     long_options, NULL)) != -1) {
  			switch (c) {
  			case 'b':