diff --git a/openldap-doc1.patch b/openldap-doc1.patch
new file mode 100644
index 0000000..13c4c41
--- /dev/null
+++ b/openldap-doc1.patch
@@ -0,0 +1,36 @@
+Upstream ITS: #7568
+
+From 6be982c000133ccf9da949d39eed23a93bc7bfc5 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 9 Apr 2013 12:41:38 +0200
+Subject: [PATCH 1/2] Fix typos in ldap.conf.5
+
+---
+ doc/man/man5/ldap.conf.5 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
+index cfde143..8f7fecd 100644
+--- a/doc/man/man5/ldap.conf.5
++++ b/doc/man/man5/ldap.conf.5
+@@ -297,7 +297,7 @@ Specifies if GSSAPI encryption (GSS_C_INTEG_FLAG and GSS_C_CONF_FLAG)
+ should be used. The default is off.
+ .TP
+ .B GSSAPI_ALLOW_REMOTE_PRINCIPAL <on/true/yes/off/false/no>
+-Specifies if GSSAPI based authentification should try to form the
++Specifies if GSSAPI based authentication should try to form the
+ target principal name out of the ldapServiceName or dnsHostName
+ attribute of the targets RootDSE entry. The default is off.
+ .SH TLS OPTIONS
+@@ -354,7 +354,7 @@ it is of critical importance that the key file is protected carefully.
+ When using Mozilla NSS, TLS_KEY specifies the name of a file that contains
+ the password for the key for the certificate specified with TLS_CERT.  The
+ modutil command can be used to turn off password protection for the cert/key
+-database.  For example, if TLS_CACERTDIR specifes /home/scarter/.moznss as
++database.  For example, if TLS_CACERTDIR specifies /home/scarter/.moznss as
+ the location of the cert/key database, use modutil to change the password
+ to the empty string:
+ .nf
+-- 
+1.8.1.4
+
diff --git a/openldap-doc2.patch b/openldap-doc2.patch
new file mode 100644
index 0000000..47b1c13
--- /dev/null
+++ b/openldap-doc2.patch
@@ -0,0 +1,27 @@
+Upstream ITS: #7568
+
+From 05c726c62785b2c307f9c5343a253d43ec7322c6 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 9 Apr 2013 12:42:31 +0200
+Subject: [PATCH 2/2] Add -Q to slaptest's help
+
+---
+ servers/slapd/slapcommon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
+index 714e2bc..153310f 100644
+--- a/servers/slapd/slapcommon.c
++++ b/servers/slapd/slapcommon.c
+@@ -92,7 +92,7 @@ usage( int tool, const char *progname )
+ 		break;
+ 
+ 	case SLAPTEST:
+-		options = " [-n databasenumber] [-u]\n";
++		options = " [-n databasenumber] [-u] [-Q]\n";
+ 		break;
+ 
+ 	case SLAPSCHEMA:
+-- 
+1.8.1.4
+
diff --git a/openldap.spec b/openldap.spec
index 4c8c149..fd45054 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -5,7 +5,7 @@
 
 Name: openldap
 Version: 2.4.35
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -42,6 +42,9 @@ Patch13: openldap-nss-regex-search-hashed-cacert-dir.patch
 Patch14: openldap-nss-ignore-certdb-type-prefix.patch
 Patch15: openldap-nss-certs-from-certdb-fallback-pem.patch
 Patch16: openldap-nss-pk11-freeslot.patch
+# pending upstream inclusion
+Patch17: openldap-doc1.patch
+Patch18: openldap-doc2.patch
 
 # Fedora specific patches
 Patch100: openldap-autoconf-pkgconfig-nss.patch
@@ -157,6 +160,8 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 %patch102 -p1
 
@@ -592,6 +597,9 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 09 2013 Jan Synáček <jsynacek@redhat.com> 2.4.35-3
+- fix: minor documentation fixes
+
 * Fri Apr 05 2013 Jan Synáček <jsynacek@redhat.com> 2.4.35-2
 - drop the evolution patch