diff --git a/encryption_method_nis.diff b/encryption_method_nis.diff
new file mode 100644
index 0000000..20114e5
--- /dev/null
+++ b/encryption_method_nis.diff
@@ -0,0 +1,10 @@
+--- lib/getdef.c
++++ lib/getdef.c	2013/11/12 13:44:01
+@@ -57,6 +57,7 @@
+ 	{"CREATE_HOME", NULL},
+ 	{"DEFAULT_HOME", NULL},
+ 	{"ENCRYPT_METHOD", NULL},
++	{"ENCRYPT_METHOD_NIS", NULL},
+ 	{"ENV_PATH", NULL},
+ 	{"ENV_SUPATH", NULL},
+ 	{"ERASECHAR", NULL},
diff --git a/shadow-login_defs.diff b/shadow-login_defs.diff
index 1de9452..f109374 100644
--- a/shadow-login_defs.diff
+++ b/shadow-login_defs.diff
@@ -290,12 +290,13 @@
  # If set to MD5 , MD5-based algorithm will be used for encrypting password
  # If set to SHA256, SHA256-based algorithm will be used for encrypting password
  # If set to SHA512, SHA512-based algorithm will be used for encrypting password
-@@ -309,7 +176,7 @@
+@@ -309,7 +176,8 @@
  # Note: If you use PAM, it is recommended to use a value consistent with
  # the PAM modules configuration.
  #
 -#ENCRYPT_METHOD DES
 +ENCRYPT_METHOD SHA512
++ENCRYPT_METHOD_NIS DES
  
  #
  # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
diff --git a/shadow.changes b/shadow.changes
index 55215ba..ed20759 100644
--- a/shadow.changes
+++ b/shadow.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 12 14:47:30 CET 2013 - kukuk@suse.de
+
+- Add ENCRYPT_METHOD_NIS for pam_unix.so (encryption_method_nis.diff)
+
 -------------------------------------------------------------------
 Tue Sep 17 14:56:44 CEST 2013 - kukuk@suse.de
 
diff --git a/shadow.spec b/shadow.spec
index 00e92e6..4d21090 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -39,6 +39,7 @@ Patch6:         shadow-4.1.5.1-manfix.patch
 Patch7:         shadow-4.1.5.1-logmsg.patch
 Patch8:         shadow-4.1.5.1-errmsg.patch
 Patch9:         shadow-4.1.5.1-backup-mode.patch
+Patch10:        encryption_method_nis.diff
 BuildRequires:  audit-devel
 BuildRequires:  libacl-devel
 BuildRequires:  libattr-devel
@@ -67,6 +68,7 @@ group accounts.
 %patch7 -p1
 %patch8 -p0
 %patch9 -p1
+%patch10 -p0
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 mv -v doc/HOWTO.utf8 doc/HOWTO