diff --git a/srcpkgs/libldap/template b/srcpkgs/libldap/template
index a059eec2c2..a5c07c4740 100644
--- a/srcpkgs/libldap/template
+++ b/srcpkgs/libldap/template
@@ -1,24 +1,35 @@
 # Template file for 'libldap'
 pkgname=libldap
-version=2.4.33
-revision=2
+version=2.4.35
+revision=1
 wrksrc="openldap-${version}"
 build_style=gnu-configure
 configure_args="--enable-dynamic --enable-proctitle --with-tls
  --enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
- --enable-syslog --disable-slapd --disable-static"
-hostmakedepends="pkg-config groff"
+ --enable-syslog --disable-slapd --disable-static
+ --with-yielding_select=yes ac_cv_func_memcmp_working=yes"
+hostmakedepends="pkg-config groff automake libtool"
 makedepends="libsasl-devel openssl-devel"
 short_desc="OpenLDAP libraries"
 license="OpenLDAP License v2.8 -- BSD alike"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.openldap.org"
 distfiles="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$version.tgz"
-checksum=81e9eca20f17a69a5d15ebc4c66a323106da4f4f80a32105bc7cdea333aca14c
+checksum=16100374c147df0d82a5c52ca60da5eca1a5ea8b5a187467d40a78e3691e9eeb
 long_desc="
  These are the run-time libraries for the OpenLDAP (Lightweight Directory
  Access Protocol) servers and clients."
 
+pre_configure() {
+	sed -e '/^STRIP/s,-s,,g' -i build/top.mk
+	sed -e "s/^AC_INIT.*/AC_INIT([openldap],[${version}])/" \
+		-e "s/^AM_INIT_AUTOMAKE.*/AM_INIT_AUTOMAKE/" -i configure.in
+	aclocal
+	autoconf
+	autoheader
+	libtoolize -f
+}
+
 post_install() {
 	# Remove unused stuff.
 	rm -rf ${DESTDIR}/usr/bin
@@ -29,11 +40,13 @@ post_install() {
 	mv ${DESTDIR}/usr/share/man/ldap.conf.5 ${DESTDIR}/usr/share/man/man5
 	# License	
 	vinstall LICENSE 644 usr/share/licenses/$pkgname
+
+	chmod 755 ${DESTDIR}/usr/lib/*.so.*
 }
 
 libldap-devel_package() {
 	depends="openssl-devel libsasl-devel ${sourcepkg}-${version}_${revision}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share/man/man3
@@ -43,7 +56,6 @@ libldap-devel_package() {
 libldap_package() {
 	conf_files="/etc/openldap/ldap.conf" 
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }