diff -u nis-3.17/debian/changelog nis-3.17/debian/changelog
--- nis-3.17/debian/changelog
+++ nis-3.17/debian/changelog
@@ -1,3 +1,13 @@
+nis (3.17-32ubuntu6.1) trusty; urgency=medium
+
+  * Make sure both characters in the salt are present before calling
+    crypt() rather than just the first in yppasswd fixing operation
+    with shadow passwords after a change in the behaviour of crypt()
+    with invalid salts (LP: #1204530).
+    This is a backport of the fix for debian bug 721737 to trusty.
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 23 Mar 2016 11:38:10 +0100
+
 nis (3.17-32ubuntu6) trusty; urgency=medium
 
   * Use dh-autoreconf to fix FTBFS on arm64 (LP: #1280666)
diff -u nis-3.17/yp-tools-2.9/src/yppasswd.c nis-3.17/yp-tools-2.9/src/yppasswd.c
--- nis-3.17/yp-tools-2.9/src/yppasswd.c
+++ nis-3.17/yp-tools-2.9/src/yppasswd.c
@@ -406,7 +406,7 @@
       return 0;
     }
 
-  if (pwd->pw_passwd[0]
+  if (pwd->pw_passwd[0] && pwd->pw_passwd[1]
       && !strncmp (pwd->pw_passwd, crypt (pwdstr, pwd->pw_passwd), 13)
       && uid)
     {