diff --git a/srcpkgs/libldap/libldap-devel.template b/srcpkgs/libldap/libldap-devel.template
index ee130ab3537..c2c8e0a12f8 100644
--- a/srcpkgs/libldap/libldap-devel.template
+++ b/srcpkgs/libldap/libldap-devel.template
@@ -7,12 +7,10 @@ long_desc="${long_desc}
 
 Add_dependency run openssl-devel
 Add_dependency run libsasl-devel
-Add_dependency run libldap
+Add_dependency run libldap ">=${version}"
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/share/man/man3 usr/share/man
 }
diff --git a/srcpkgs/libldap/template b/srcpkgs/libldap/template
index eb47968a87c..f47f215d113 100644
--- a/srcpkgs/libldap/template
+++ b/srcpkgs/libldap/template
@@ -1,16 +1,17 @@
 # Template file for 'libldap'
 pkgname=libldap
-version=2.4.24
+version=2.4.30
 wrksrc="openldap-${version}"
+homepage="http://www.openldap.org"
 distfiles="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$version.tgz"
 build_style=gnu-configure
-configure_args="--enable-dynamic --enable-proctitle
---enable-ipv6 --enable-local --with-cyrus-sasl --with-threads --with-tls
+configure_args="--enable-dynamic --enable-proctitle --with-tls
+--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
 --enable-syslog --disable-slapd"
-revision=1
 short_desc="OpenLDAP libraries"
+license="OpenLDAP License v2.8 -- BSD alike"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=fdcecb64082a0d8e124f13b31fccf4765901e29decaf4224b28d4cff90a14614
+checksum=fc013e528616f8578d9f221409c48af9b8937a62005e0bec88f6f1c4c8ff3d81
 long_desc="
  These are the run-time libraries for the OpenLDAP (Lightweight Directory
  Access Protocol) servers and clients."
@@ -23,8 +24,7 @@ Add_dependency build libsasl-devel
 Add_dependency build openssl-devel
 Add_dependency build groff
 
-post_install()
-{
+post_install() {
 	# Remove unused stuff.
 	rm -rf ${DESTDIR}/usr/bin
 	rm -rf ${DESTDIR}/usr/share/man/man[18]
@@ -32,4 +32,6 @@ post_install()
 	mv ${DESTDIR}/usr/share/man/man5/ldap.conf.5 ${DESTDIR}/usr/share/man
 	rm -f ${DESTDIR}/usr/share/man/man5/*
 	mv ${DESTDIR}/usr/share/man/ldap.conf.5 ${DESTDIR}/usr/share/man/man5
+	# License	
+	vinstall LICENSE 644 usr/share/licenses/$pkgname
 }