diff --git a/postfix.changes b/postfix.changes
index 3b1c608..5514ae3 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 25 13:54:40 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
+
+- Move ldap into an own sub-package like all other databases
+- Move manual pages to correct sub-package
+
 -------------------------------------------------------------------
 Fri Aug 21 08:44:22 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/postfix.spec b/postfix.spec
index cbbfbbf..4e4afba 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -54,6 +54,7 @@
 %bcond_with    lmdb
 %bcond_with    libnsl
 %endif
+%bcond_without ldap
 Name:           postfix
 Version:        3.5.6
 Release:        0
@@ -90,7 +91,9 @@ BuildRequires:  libicu-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  m4
 BuildRequires:  mysql-devel
+%if %{with ldap}
 BuildRequires:  openldap2-devel
+%endif
 BuildRequires:  pcre-devel
 BuildRequires:  pkgconfig
 BuildRequires:  postgresql-devel
@@ -165,6 +168,18 @@ Postfix plugin to support PostgreSQL maps. This library will be loaded
 by starting %{name} if you'll access a postmap which is stored in
 PostgreSQL.
 
+%if %{with ldap}
+%package      ldap
+Summary:        Postfix LDAP map support
+Group:          Productivity/Networking/Email/Servers
+Requires:       %{name} = %{version}
+Provides:       postfix:/usr/lib/postfix/postfix-ldap.so
+
+%description ldap
+This provides support for LDAP maps in Postfix. If you plan to use LDAP
+maps with Postfix, you need this.
+%endif
+
 %if %{with lmdb}
 %package      lmdb
 Summary:        Postfix plugin to support LMDB maps
@@ -208,8 +223,10 @@ else
   export AUXLIBS="${AUXLIBS} -lssl -lcrypto"
 fi
 #
+%if %{with ldap}
 export CCARGS="${CCARGS} -DHAS_LDAP -DLDAP_DEPRECATED=1 -DUSE_LDAP_SASL"
 export AUXLIBS_LDAP="-lldap -llber"
+%endif
 #
 export CCARGS="${CCARGS} -DHAS_PCRE"
 export AUXLIBS_PCRE="-lpcre"
@@ -542,7 +559,6 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/canonical
 %config(noreplace) %{_sysconfdir}/%{name}/header_checks
 %config(noreplace) %{_sysconfdir}/%{name}/helo_access
-%config(noreplace) %{_sysconfdir}/%{name}/ldap_aliases.cf
 %config(noreplace) %{_sysconfdir}/%{name}/main.cf
 %config(noreplace) %{_sysconfdir}/%{name}/master.cf
 %attr(0750,root,root) %config %{_sysconfdir}/%{name}/post-install
@@ -597,7 +613,6 @@ fi
 %{_libexecdir}/sendmail
 %dir %{pf_shlib_directory}
 %{pf_shlib_directory}/*[^.so]
-%{pf_shlib_directory}/%{name}-ldap.so
 %{pf_shlib_directory}/%{name}-pcre.so
 %{pf_shlib_directory}/lib%{name}-dns.so
 %{pf_shlib_directory}/lib%{name}-global.so
@@ -609,6 +624,10 @@ fi
 
 %{conf_backup_dir}
 %dir %attr(0700,%{name},root) %{pf_data_directory}
+%exclude %{_mandir}/man5/ldap_table.5*
+%exclude %{_mandir}/man5/lmdb_table.5*
+%exclude %{_mandir}/man5/mysql_table.5*
+%exclude %{_mandir}/man5/pgsql_table.5*
 %{_mandir}/man?/*%{?ext_man}
 %dir %attr(0755,root,root) /%{pf_queue_directory}
 %dir %attr(0700,%{name},root) /%{pf_queue_directory}/active
@@ -640,16 +659,26 @@ fi
 %config(noreplace) %attr(640, root, %{name}) %{_sysconfdir}/%{name}/*_maps.cf
 %config(noreplace) %{_sysconfdir}/%{name}/main.cf-mysql
 %{pf_shlib_directory}/%{name}-mysql.so
+%{_mandir}/man5/mysql_table.5%{?ext_man}
 %if 0%{?suse_version} >= 1330
 %{_sysusersdir}/postfix-vmail-user.conf
 %endif
 
 %files postgresql
 %{pf_shlib_directory}/%{name}-pgsql.so
+%{_mandir}/man5/pgsql_table.5%{?ext_man}
+
+%if %{with ldap}
+%files ldap
+%config(noreplace) %{_sysconfdir}/%{name}/ldap_aliases.cf
+%{pf_shlib_directory}/%{name}-ldap.so
+%{_mandir}/man5/ldap_table.5%{?ext_man}
+%endif
 
 %if %{with lmdb}
 %files lmdb
 %{pf_shlib_directory}/%{name}-lmdb.so
+%{_mandir}/man5/lmdb_table.5%{?ext_man}
 %endif
 
 %changelog