diff --git a/openldap-doc3.patch b/openldap-doc3.patch
new file mode 100644
index 0000000..d0e7821
--- /dev/null
+++ b/openldap-doc3.patch
@@ -0,0 +1,39 @@
+From 128a8c486e86b8e8c8d34f0eb9fdc0b580212e5b Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 3 Sep 2013 14:09:37 +0200
+Subject: [PATCH] Fix typos in manpages.
+
+---
+ doc/man/man1/ldapsearch.1   | 2 +-
+ doc/man/man5/slapd-passwd.5 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1
+index 82ddddb..150f064 100644
+--- a/doc/man/man1/ldapsearch.1
++++ b/doc/man/man1/ldapsearch.1
+@@ -456,7 +456,7 @@ This command:
+ .fi
+ .LP
+ will perform a one-level search at the c=US level for all entries
+-whose organization name (o) begins begins with \fBUniversity\fP.
++whose organization name (o) begins with \fBUniversity\fP.
+ The organization name and description attribute values will be retrieved
+ and printed to standard output, resulting in output similar to this:
+ .LP
+diff --git a/doc/man/man5/slapd-passwd.5 b/doc/man/man5/slapd-passwd.5
+index fbd30f2..2dc5c5d 100644
+--- a/doc/man/man5/slapd-passwd.5
++++ b/doc/man/man5/slapd-passwd.5
+@@ -13,7 +13,7 @@ serves up the user account information listed in the system
+ .BR passwd (5)
+ file.  This backend is provided for demonstration purposes only.
+ The DN of each entry is "uid=<username>,<suffix>".
+-Note that non-base searches scan the the entire passwd file, and
++Note that non-base searches scan the entire passwd file, and
+ are best suited for hosts with small passwd files.
+ .SH CONFIGURATION
+ This
+-- 
+1.8.3.1
+
diff --git a/openldap.spec b/openldap.spec
index 80b3196..9db1ee5 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -5,7 +5,7 @@
 
 Name: openldap
 Version: 2.4.36
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -49,6 +49,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
+# more documentation fixes, upstreamed
+Patch21: openldap-doc3.patch
 
 # Fedora specific patches
 Patch100: openldap-autoconf-pkgconfig-nss.patch
@@ -166,6 +168,7 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
 %patch16 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %patch102 -p1
 
@@ -595,6 +598,9 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep  4 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.36-2
+- fix: typos in manpages
+
 * Tue Aug 20 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.36-1
 - new upstream release
   + compile-in mdb backend