diff --git a/debian/changelog b/debian/changelog
index 4b5d7c1e..e5ecb250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,12 @@ shadow (1:4.1.0-1) UNRELEASED; urgency=low
       + 411_chpasswd_document_no_pam
       + 494_passwd_lock
       + 417_passwd_warndays
+    - Updated patches:
+      + debian/patches/504_undef_USE_PAM.dpatch
+        MD5_CRYPT_ENAB is back in login.defs to define the default crypt
+        algorithm. It is tagged as deprecated and ENCRYPT_METHOD is
+        recommended instead. New algorithms are also available.
+        Closes: #447747
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>  Sat, 17 Nov 2007 18:33:26 +0100
 
diff --git a/debian/patches/504_undef_USE_PAM.dpatch b/debian/patches/504_undef_USE_PAM.dpatch
index c21efe1b..bb99ae99 100755
--- a/debian/patches/504_undef_USE_PAM.dpatch
+++ b/debian/patches/504_undef_USE_PAM.dpatch
@@ -122,54 +122,3 @@ Index: shadow-4.0.18.1/src/chgpasswd.c
  
  #ident "$Id: chgpasswd.c,v 1.5 2006/06/20 20:00:04 kloczek Exp $"
  
-Index: shadow-4.0.18.1/lib/getdef.c
-===================================================================
---- shadow-4.0.18.1.orig/lib/getdef.c	2006-09-17 12:17:55.628018587 +0200
-+++ shadow-4.0.18.1/lib/getdef.c	2006-09-17 12:17:58.260039514 +0200
-@@ -82,6 +82,9 @@
- 	{"UMASK", NULL},
- 	{"USERDEL_CMD", NULL},
- 	{"USERGROUPS_ENAB", NULL},
-+	/* some utilities are not compiled with PAM, and need
-+	 * MD5_CRYPT_ENAB variable to know wether the passwords use MD5 */
-+	{"MD5_CRYPT_ENAB", NULL},
- #ifndef USE_PAM
- 	{"CHFN_AUTH", NULL},
- 	{"CHSH_AUTH", NULL},
-@@ -93,7 +96,6 @@
- 	{"LASTLOG_ENAB", NULL},
- 	{"LOGIN_STRING", NULL},
- 	{"MAIL_CHECK_ENAB", NULL},
--	{"MD5_CRYPT_ENAB", NULL},
- 	{"MOTD_FILE", NULL},
- 	{"NOLOGINS_FILE", NULL},
- 	{"OBSCURE_CHECKS_ENAB", NULL},
-Index: shadow-4.0.18.1/lib/prototypes.h
-===================================================================
---- shadow-4.0.18.1.orig/lib/prototypes.h	2006-02-07 17:36:30.000000000 +0100
-+++ shadow-4.0.18.1/lib/prototypes.h	2006-09-17 12:17:58.260039514 +0200
-@@ -130,8 +130,12 @@
- /* rlogin.c */
- extern int do_rlogin (const char *, char *, int, char *, int);
- 
-+#ifndef USE_PAM
-+/* As we are messing up with USE_PAM in libmisc/salt.c, make sure
-+ * crypt_make_salt is never used with utilities compiled with PAM */
- /* salt.c */
- extern char *crypt_make_salt (void);
-+#endif
- 
- /* setugid.c */
- extern int setup_groups (const struct passwd *);
-Index: shadow-4.0.18.1/libmisc/salt.c
-===================================================================
---- shadow-4.0.18.1.orig/libmisc/salt.c	2005-08-31 19:24:58.000000000 +0200
-+++ shadow-4.0.18.1/libmisc/salt.c	2006-09-17 12:17:58.260039514 +0200
-@@ -6,6 +6,7 @@
-  */
- 
- #include <config.h>
-+#undef USE_PAM
- 
- #ident "$Id: salt.c,v 1.10 2005/08/31 17:24:58 kloczek Exp $"
-