diff --git a/need_build b/need_build
index cc39133047..f802787147 100644
--- a/need_build
+++ b/need_build
@@ -19,7 +19,6 @@
   desktop/kde/games/libkdegames
   desktop/kde/plasma/libksysguard
   desktop/kde/porting-aids/kdelibs4-support
-  desktop/kde/porting-aids/khtml
   desktop/kde/porting-aids/krunner
   desktop/toolkit/qt5/qt5-webkit
   editor/emacs/emacs-php-mode
@@ -54,8 +53,6 @@
   programming/language/perl/perl-HTML-Format
   programming/language/perl/perl-HTML-FormatText-WithLinks
   programming/language/perl/perl-HTML-FormatText-WithLinks-AndTables
-  programming/language/perl/perl-HTML-Template
-  programming/language/perl/perl-HTML-Template-Pro
   programming/language/python/python-pyblock
   programming/language/python/python-sphinx
   programming/library/libaccounts-glib
diff --git a/server/openldap/actions.py b/server/openldap/actions.py
index 14e0963637..9066727692 100644
--- a/server/openldap/actions.py
+++ b/server/openldap/actions.py
@@ -51,6 +51,7 @@ def setup():
                --enable-local \
                --enable-proctitle \
                --enable-overlays=mod \
+               --enable-ndb=no \
                --with-pic \
                --with-threads \
                --with-cyrus-sasl \
@@ -75,7 +76,7 @@ def setup():
                      --disable-perl \
                      --without-tls \
                      --without-cyrus-sasl"
-    else: options += " --with-tls=moznss"
+    else: options += " --with-tls=auto"
 
     shelltools.export("AUTOMAKE", "/bin/true")
     #autotools.autoreconf("-fi")
diff --git a/server/openldap/pspec.xml b/server/openldap/pspec.xml
index cd5e887d2f..f6cd05613d 100644
--- a/server/openldap/pspec.xml
+++ b/server/openldap/pspec.xml
@@ -24,6 +24,7 @@
 <!--             <Dependency>unixODBC-devel</Dependency> -->
             <Dependency>libutil-linux-devel</Dependency>
             <Dependency>e2fsprogs-devel</Dependency>
+            <Dependency>chrpath</Dependency>
             <Dependency>groff</Dependency>
         </BuildDependencies>
         <Patches>