diff --git a/.gitignore b/.gitignore
index 04d4580..f15e25e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ slapi-nis-0.17.tar.gz
 /slapi-nis-0.28.tar.gz.sig
 /slapi-nis-0.34.tar.gz
 /slapi-nis-0.34.tar.gz.sig
+/slapi-nis-0.36.tar.gz
+/slapi-nis-0.36.tar.gz.sig
diff --git a/slapi-nis.spec b/slapi-nis.spec
index f7d78cf..db1c233 100644
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:		slapi-nis
-Version:	0.34
+Version:	0.36
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -65,6 +65,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Tue Jan 24 2012 Nalin Dahyabhai <nalin@redhat.com> - 0.36-1
+- take steps to avoid making yp_first/yp_next clients loop indefinitely
+  when a single LDAP entry produces multiple copies of the same NIS key
+  for a given map
+
+* Tue Jan 24 2012 Nalin Dahyabhai <nalin@redhat.com> - 0.35-1
+- add mmatch/mregmatch[i]/mregsub[i] formatting functions which work like
+  match/regmatch[i]/regsub[i], but which can handle and return lists of
+  zero or more results (part of #783274)
+
 * Thu Jan 19 2012 Nalin Dahyabhai <nalin@redhat.com> - 0.34-1
 - do entry comparisons ourselves, albeit less throughly, to avoid the worst
   case in pathological cases (more of #771444)
diff --git a/sources b/sources
index 47c40fc..fbbc43a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0050b795b64418f40e8287feef4e1f42  slapi-nis-0.34.tar.gz
-5f84a2970a0b67e401cab8cd3b478026  slapi-nis-0.34.tar.gz.sig
+dccfd103ec12affa43e92b74c025e20d  slapi-nis-0.36.tar.gz
+f18dd0893041681972528ebd66545aee  slapi-nis-0.36.tar.gz.sig