diff --git a/.gitignore b/.gitignore
index c4ac239..82f951d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /openldap-2.4.34.tgz
 /ltb-project-openldap-ppolicy-check-password-1.1.tar.gz
 /openldap-2.4.35.tgz
+/openldap-2.4.36.tgz
diff --git a/openldap-manpages.patch b/openldap-manpages.patch
index 1678b38..b69a391 100644
--- a/openldap-manpages.patch
+++ b/openldap-manpages.patch
@@ -6,13 +6,12 @@ diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
 index 3def6da..466c772 100644
 --- a/doc/man/man1/ldapmodify.1
 +++ b/doc/man/man1/ldapmodify.1
-@@ -397,9 +397,7 @@ exit status and a diagnostic message being written to standard error.
+@@ -397,8 +397,7 @@ exit status and a diagnostic message being written to standard error.
  .BR ldap_add_ext (3),
  .BR ldap_delete_ext (3),
  .BR ldap_modify_ext (3),
 -.BR ldap_modrdn_ext (3),
--.BR ldif (5),
--.BR slapd.replog (5)
+-.BR ldif (5).
 +.BR ldif (5)
  .SH AUTHOR
  The OpenLDAP Project <http://www.openldap.org/>
@@ -29,44 +28,6 @@ index cfde143..63592cb 100644
  This parameter is ignored with GnuTLS.
  
  When using Mozilla NSS, <path> may contain a Mozilla NSS cert/key
-diff --git a/doc/man/man5/ldif.5 b/doc/man/man5/ldif.5
-index 79615b6..2c06246 100644
---- a/doc/man/man5/ldif.5
-+++ b/doc/man/man5/ldif.5
-@@ -270,8 +270,7 @@ commands.
- .BR ldapmodify (1),
- .BR slapadd (8),
- .BR slapcat (8),
--.BR slapd\-ldif (5),
--.BR slapd.replog (5).
-+.BR slapd\-ldif (5).
- .LP
- "LDAP Data Interchange Format," Good, G., RFC 2849.
- .SH ACKNOWLEDGEMENTS
-diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
-index 742876a..31643c7 100644
---- a/doc/man/man5/slapd-config.5
-+++ b/doc/man/man5/slapd-config.5
-@@ -2086,7 +2086,6 @@ default slapd configuration directory
- .BR slapd.conf (5),
- .BR slapd.overlays (5),
- .BR slapd.plugin (5),
--.BR slapd.replog (5),
- .BR slapd (8),
- .BR slapacl (8),
- .BR slapadd (8),
-diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
-index 0a3a955..352cc7e 100644
---- a/doc/man/man5/slapd.conf.5
-+++ b/doc/man/man5/slapd.conf.5
-@@ -2016,7 +2016,6 @@ default slapd configuration file
- .BR slapd.backends (5),
- .BR slapd.overlays (5),
- .BR slapd.plugin (5),
--.BR slapd.replog (5),
- .BR slapd (8),
- .BR slapacl (8),
- .BR slapadd (8),
 diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
 index b739f4d..e2a1a00 100644
 --- a/doc/man/man8/slapd.8
diff --git a/openldap.spec b/openldap.spec
index 58da762..80b3196 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -4,8 +4,8 @@
 %global check_password_version 1.1
 
 Name: openldap
-Version: 2.4.35
-Release: 7%{?dist}
+Version: 2.4.36
+Release: 1%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -42,9 +42,6 @@ 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
-# documentation patches, already included upstream
-Patch17: openldap-doc1.patch
-Patch18: openldap-doc2.patch
 # fix back_perl problems with lt_dlopen()
 # might cause crashes because of symbol collisions
 # the proper fix is to link all perl modules against libperl
@@ -52,8 +49,6 @@ Patch18: openldap-doc2.patch
 Patch19: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
 # ldapi sasl fix pending upstream inclusion
 Patch20: openldap-ldapi-sasl.patch
-# already included upstream
-Patch21: openldap-loglevel2bvarray.patch
 
 # Fedora specific patches
 Patch100: openldap-autoconf-pkgconfig-nss.patch
@@ -169,11 +164,8 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
-%patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
 
 %patch102 -p1
 
@@ -223,6 +215,7 @@ pushd openldap-%{version}
 	--enable-backends=mod \
 	--enable-bdb=yes \
 	--enable-hdb=yes \
+	--enable-mdb=yes \
 	--enable-monitor=yes \
 	--disable-ndb \
 	\
@@ -546,7 +539,6 @@ exit 0
 %{_libdir}/openldap/auditlog*
 %{_libdir}/openldap/back_dnssrv*
 %{_libdir}/openldap/back_ldap*
-%{_libdir}/openldap/back_mdb*
 %{_libdir}/openldap/back_meta*
 %{_libdir}/openldap/back_null*
 %{_libdir}/openldap/back_passwd*
@@ -603,6 +595,10 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 20 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.36-1
+- new upstream release
+  + compile-in mdb backend
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.35-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 975ef6f..5ac41b8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cd75d82ca89fb0280cba66ca6bd97448  openldap-2.4.35.tgz
+744701405d396b1fb9de6cb7a453c6e9  openldap-2.4.36.tgz
 3535b7cd46dcf41c9a9480efa9e64618  ltb-project-openldap-ppolicy-check-password-1.1.tar.gz