diff --git a/.gitignore b/.gitignore
index 15e2654..443c2a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ slapi-nis-0.17.tar.gz
 /slapi-nis-0.47.tar.gz.sig
 /slapi-nis-0.47.5.tar.gz
 /slapi-nis-0.47.5.tar.gz.sig
+/slapi-nis-0.47.7.tar.gz
+/slapi-nis-0.47.7.tar.gz.sig
diff --git a/slapi-nis.spec b/slapi-nis.spec
index b68f719..d78fddb 100644
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:		slapi-nis
-Version:	0.47.5
+Version:	0.47.7
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -21,11 +21,17 @@ 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
+%if 0%{?fedora} > 18 || 0%{?rhel} > 6
+BuildRequires:	libsss_nss_idmap-devel
+%define sss_nss_opts --with-sss-nss-idmap
 %else
-BuildRequires: tcp_wrappers
+%define sss_nss_opts %{nil}
+%endif
+BuildRequires:	pam-devel
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
+BuildRequires:	tcp_wrappers-devel
+%else
+BuildRequires:	tcp_wrappers
 %endif
 %if 0%{?fedora} > 14 || 0%{?rhel} > 6
 BuildRequires:	libtirpc-devel
@@ -51,7 +57,9 @@ for attributes from multiple entries in the tree.
 %setup -q
 
 %build
-%configure --disable-static --with-tcp-wrappers --with-ldap=%{ldap_impl} %{betxn_opts}
+%configure --disable-static --with-tcp-wrappers --with-ldap=%{ldap_impl} \
+	--with-nsswitch --with-pam --with-pam-service=system-auth \
+	%{sss_nss_opts} %{betxn_opts}
 sed -i -e 's,%{_libdir}/dirsrv/plugins/,,g' -e 's,.so$,,g' doc/examples/*.ldif
 make %{?_smp_mflags}
 
@@ -71,12 +79,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING NEWS README STATUS doc/*.txt doc/examples/*.ldif
+%doc COPYING NEWS README STATUS doc/*.txt doc/examples/*.ldif doc/ipa
 %{_mandir}/man1/*
 %{_libdir}/dirsrv/plugins/*.so
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Wed Aug  7 2013 Nalin Dahyabhai <nalin@redhat.com> - 0.47.7-1
+- fix building against versions of directory server older than 1.3.0, which
+  first introduced slapi_escape_filter_value()
+
+* Wed Aug  7 2013 Nalin Dahyabhai <nalin@redhat.com> - 0.47.6-1
+- only buildrequire libsss_nss_idmap-devel on releases that included SSSD
+  version 1.10 or later, where it first appeared
+
 * 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
@@ -85,6 +101,7 @@ rm -rf $RPM_BUILD_ROOT
   - 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
+- include IPA-specific docs as docs
 
 * 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
diff --git a/sources b/sources
index dc8b4da..b62d959 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e998a7fd608a58a14f7b0afeb7979da4  slapi-nis-0.47.5.tar.gz
-854b00a0577046d4baef5a467d0cd490  slapi-nis-0.47.5.tar.gz.sig
+a3231f3bd59ad846934cd1f5a1c73653  slapi-nis-0.47.7.tar.gz
+441847963e9e0be5878070e018a5a389  slapi-nis-0.47.7.tar.gz.sig