diff --git a/.gitignore b/.gitignore
index 0b4193c..15e2654 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@ slapi-nis-0.17.tar.gz
 /slapi-nis-0.46.tar.gz.sig
 /slapi-nis-0.47.tar.gz
 /slapi-nis-0.47.tar.gz.sig
+/slapi-nis-0.47.5.tar.gz
+/slapi-nis-0.47.5.tar.gz.sig
diff --git a/slapi-nis.spec b/slapi-nis.spec
index 380f048..b68f719 100644
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@@ -10,8 +10,8 @@
 %endif
 
 Name:		slapi-nis
-Version:	0.47
-Release:	2%{?dist}
+Version:	0.47.5
+Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -21,6 +21,7 @@ Source1:	https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.ta
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	389-ds-base-devel, %{ldap_impl}-devel
 BuildRequires:	nspr-devel, nss-devel, /usr/bin/rpcgen
+BuildRequires:  libsss_nss_idmap-devel, pam-devel
 %if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires: tcp_wrappers-devel
 %else
@@ -76,12 +77,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Wed Aug  7 2013 Nalin Dahyabhai <nalin@redhat.com> - 0.47.5-1
+- merge Alexander Bokovoy's patches to
+  - teach the schema compatibility plugin to optionally serve user and group
+    information retrieved from libc as part of a set of compat entries
+  - handle simple bind requests for those entries by calling out to PAM
+  - to rewrite the DN of incoming bind requests to compat entries to point
+    at the source entries, instead of returning a referral which most clients
+    won't handle
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.47-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
 * Fri May 24 2013 Nalin Dahyabhai <nalin@redhat.com> - 0.47-1
 - fix request argument memory leaks in NIS server
-- add a %sort function
+- add a %%sort function
 
 * Thu Apr  4 2013 Nalin Dahyabhai <nalin@redhat.com> - 0.46-1
 - when checking if we can skip processing for a given change, pay attention to
diff --git a/sources b/sources
index 4ab8c29..dc8b4da 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-286390514d1d05c0188a7d61df7c17d3  slapi-nis-0.47.tar.gz
-82e18b4ff6c708823d186157293476aa  slapi-nis-0.47.tar.gz.sig
+e998a7fd608a58a14f7b0afeb7979da4  slapi-nis-0.47.5.tar.gz
+854b00a0577046d4baef5a467d0cd490  slapi-nis-0.47.5.tar.gz.sig