diff --git a/debian/10-DU-nss_name-local_realms.patch b/debian/meta/10-DU-nss_name-local_realms.patch
similarity index 100%
rename from debian/10-DU-nss_name-local_realms.patch
rename to debian/meta/10-DU-nss_name-local_realms.patch
diff --git a/debian/20-DU-static-translation.patch b/debian/meta/20-DU-static-translation.patch
similarity index 100%
rename from debian/20-DU-static-translation.patch
rename to debian/meta/20-DU-static-translation.patch
diff --git a/debian/30-DU-mnsswitch.patch b/debian/meta/30-DU-mnsswitch.patch
similarity index 100%
rename from debian/30-DU-mnsswitch.patch
rename to debian/meta/30-DU-mnsswitch.patch
diff --git a/debian/40-DU-mnssfix.patch b/debian/meta/40-DU-mnssfix.patch
similarity index 100%
rename from debian/40-DU-mnssfix.patch
rename to debian/meta/40-DU-mnssfix.patch
diff --git a/debian/50-DU-mnsslog.patch b/debian/meta/50-DU-mnsslog.patch
similarity index 100%
rename from debian/50-DU-mnsslog.patch
rename to debian/meta/50-DU-mnsslog.patch
diff --git a/debian/meta/zs1-local-realms-report.patch b/debian/meta/zs1-local-realms-report.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4f59c2692b155c077bd9bf288cf856200f069c0b
--- /dev/null
+++ b/debian/meta/zs1-local-realms-report.patch
@@ -0,0 +1,18 @@
+Index: libnfsidmap-0.25/libnfsidmap.c
+===================================================================
+--- libnfsidmap-0.25.orig/libnfsidmap.c
++++ libnfsidmap-0.25/libnfsidmap.c
+@@ -285,10 +285,11 @@ int nfs4_init_name_mapping(char *conffil
+ 			TAILQ_FOREACH(r, &local_realms->fields, link) {
+ 				siz += (strlen(r->field)+4);
+ 			}
+-			buf = malloc(siz);
++			buf = malloc(siz+1);
+ 			if (buf) {
++				*buf = '\0';
+ 				TAILQ_FOREACH(r, &local_realms->fields, link) {
+-					sprintf(buf, "'%s' ", r->field);
++					sprintf(buf+strlen(buf), "'%s' ", r->field);
+ 				}
+ 				IDMAP_LOG(1, ("libnfsidmap: Realms list: %s", buf));
+ 				free(buf);
diff --git a/debian/series b/debian/series
index 69d7c609cf978d677ee75964c3431d4e34b6a217..7b3ba11da0af35f317f68fe23d8c16e3f8fb915b 100644
--- a/debian/series
+++ b/debian/series
@@ -1,7 +1,9 @@
 01-661215-wrong-double-ldap-check.patch
 02-idmapd.conf.5.patch
-10-DU-nss_name-local_realms.patch
-20-DU-static-translation.patch
-30-DU-mnsswitch.patch
-40-DU-mnssfix.patch
-50-DU-mnsslog.patch
+03-uid-map-krb5.patch
+meta/10-DU-nss_name-local_realms.patch
+meta/20-DU-static-translation.patch
+meta/30-DU-mnsswitch.patch
+meta/40-DU-mnssfix.patch
+meta/50-DU-mnsslog.patch
+meta/zs1-local-realms-report.patch
diff --git a/make.sh b/make.sh
index baa3c9407773370c3ccec5b63be0e81a8e3dba3c..319dacc0db055c4894fbb1f61556f2371fac0d9a 100755
--- a/make.sh
+++ b/make.sh
@@ -19,7 +19,7 @@ apt source libnfsidmap2
 cd libnfsidmap-0.25
 cp -rv ../debian/* debian/patches
 
-dch -l "+du" "fixed mnss.c"
+dch -l "+zs" "fixed mnss.c"
 dch -a "Added mnsswitch patch"
 dch -a "Implementation of client side Static translation method"
 dch -a "nss_name_to_uid/gid() search also Local-Realms"