diff -Nru libnfsidmap-0.25/debian/changelog libnfsidmap-0.25/debian/changelog
--- libnfsidmap-0.25/debian/changelog	2013-05-25 11:26:52.000000000 +1000
+++ libnfsidmap-0.25/debian/changelog	2017-10-31 13:32:15.000000000 +1100
@@ -1,3 +1,11 @@
+libnfsidmap (0.25-5ubuntu1) UNRELEASED; urgency=medium
+
+  * debian/patches/03-nss.patch: Fix nss.c (LP: #1728310)
+    Idmap fails to map uid to localname or vice versa in case an 'at' ( @ ) sign
+    is included in the localname
+
+ -- Uli Felzmann <ulrich.felzmann@gmail.com>  Tue, 31 Oct 2017 13:29:45 +1100
+
 libnfsidmap (0.25-5) unstable; urgency=low
 
   * Standards Version is 3.9.4
diff -Nru libnfsidmap-0.25/debian/patches/03-nss.patch libnfsidmap-0.25/debian/patches/03-nss.patch
--- libnfsidmap-0.25/debian/patches/03-nss.patch	1970-01-01 10:00:00.000000000 +1000
+++ libnfsidmap-0.25/debian/patches/03-nss.patch	2017-10-31 13:24:33.000000000 +1100
@@ -0,0 +1,23 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+--- a/nss.c
++++ b/nss.c
+@@ -135,7 +135,7 @@
+ 	char *l = NULL;
+ 	int len;
+ 
+-	c = strchr(name, '@');
++	c = strrchr(name, '@');
+ 	if (c == NULL && domain != NULL)
+ 		goto out;
+ 	if (c == NULL && domain == NULL) {
+@@ -276,7 +276,7 @@
+ 		return -EINVAL;
+ 
+ 	/* get princ's realm */
+-	princ_realm = strstr(princ, "@");
++	princ_realm = strrchr(princ, '@');
+ 	if (princ_realm == NULL)
+ 		return -EINVAL;
+ 	princ_realm++;
diff -Nru libnfsidmap-0.25/debian/patches/series libnfsidmap-0.25/debian/patches/series
--- libnfsidmap-0.25/debian/patches/series	2013-05-25 10:52:12.000000000 +1000
+++ libnfsidmap-0.25/debian/patches/series	2017-10-31 13:23:36.000000000 +1100
@@ -1,2 +1,3 @@
 01-661215-wrong-double-ldap-check.patch
 02-idmapd.conf.5.patch
+03-nss.patch