diff --git a/openldap-config-build-schema-inc.patch b/openldap-config-build-schema-inc.patch
new file mode 100644
index 0000000..db302df
--- /dev/null
+++ b/openldap-config-build-schema-inc.patch
@@ -0,0 +1,29 @@
+Resolves: RHBZ#1028935
+
+From d37da266c6b7196abc758daa870e893eb7c22dce Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Fri, 14 Jun 2013 12:36:48 +0200
+Subject: [PATCH] Fix config_build_schema_inc
+
+If an 'include' directive contains a custom file instead of a schema file,
+process it as well.
+---
+ servers/slapd/bconfig.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
+index def6daf..3c3d3e9 100644
+--- a/servers/slapd/bconfig.c
++++ b/servers/slapd/bconfig.c
+@@ -6758,7 +6758,7 @@ config_build_schema_inc( ConfigArgs *c, CfEntryInfo *ceparent,
+ 
+ 	for (; cf; cf=cf->c_sibs, c->depth++) {
+ 		if ( !cf->c_at_head && !cf->c_cr_head && !cf->c_oc_head &&
+-			!cf->c_om_head && !cf->c_syn_head ) continue;
++			!cf->c_om_head && !cf->c_syn_head && !cf->c_kids ) continue;
+ 		c->value_dn.bv_val = c->log;
+ 		LUTIL_SLASHPATH( cf->c_file.bv_val );
+ 		bv.bv_val = strrchr(cf->c_file.bv_val, LDAP_DIRSEP[0]);
+-- 
+1.8.1.4
+
diff --git a/openldap.spec b/openldap.spec
index 556b2d0..3d57ac5 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -5,7 +5,7 @@
 
 Name: openldap
 Version: 2.4.37
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -48,6 +48,8 @@ Patch16: openldap-nss-pk11-freeslot.patch
 Patch19: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
 # ldapi sasl fix pending upstream inclusion
 Patch20: openldap-ldapi-sasl.patch
+# slaptest fix pending upstream inclusion
+Patch21: openldap-config-build-schema-inc.patch
 
 # Fedora specific patches
 Patch100: openldap-autoconf-pkgconfig-nss.patch
@@ -164,6 +166,7 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
 %patch16 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %patch102 -p1
 
@@ -599,6 +602,9 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 11 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.37-2
+- fix: slaptest incorrectly handles 'include' directives containing a custom file (#1028935)
+
 * Wed Oct 30 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.37-1
 - new upstream release (#1023916)
 - fix: missing a linefeed at the end of file /etc/openldap/ldap.conf (#1019836)