diff --git a/dev-libs/mozldap/ChangeLog b/dev-libs/mozldap/ChangeLog
index 963f10b3..9a036ca8 100644
--- a/dev-libs/mozldap/ChangeLog
+++ b/dev-libs/mozldap/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Nov 2008; Mario Fetka <mario.fetka@gmail.com> +mozldap-6.0.6.ebuild:
+  Bump
+
   20 Aug 2008; Mario Fetka <mario.fetka@gmail.com> mozldap-6.0.5.ebuild:
   Repoman Cleanup
 
diff --git a/dev-libs/mozldap/Manifest b/dev-libs/mozldap/Manifest
index 0f6e42c5..00d85f36 100644
--- a/dev-libs/mozldap/Manifest
+++ b/dev-libs/mozldap/Manifest
@@ -1,5 +1,7 @@
 AUX mozldap-6.0.4-pkgconfig.patch 714 RMD160 e0380bc0d6af49924c9e599f3ce8e1512ae8105f SHA1 d427f59df496bf5eff0aa5b33918a19142bce22c SHA256 d93fc59fa49f825484d8456288d6d98aaaccf4ee729ca27f0887a9ba6d812a10
 DIST mozldap-6.0.5.tar.gz 708776 RMD160 e5843ac02181f36d3880ec22b955a0ce189ce11b SHA1 2a6c8c227d1b1f1a85dd4f7c75796f51e7c899af SHA256 b7a2faf0cdbf949890312124978b4412ddc22107f2f897bcb1d5237cfa903337
+DIST mozldap-6.0.6.tar.gz 708821 RMD160 d932813f0b6f5808c8f0b255718a413d6a6e6ba5 SHA1 db7b8d845f8917638512ae92381675fe76432eff SHA256 3a7b94c6698e2acb91a577decee5eb6103f183d6b9833abb169124818ba80d06
 EBUILD mozldap-6.0.5.ebuild 3380 RMD160 7cc85e245e863198a152e9ccbfaf75e705b76d9b SHA1 c31daa0ce15cf894ce9108e3ae9927ac31075739 SHA256 80b3fa7f0afd037d145d25845e09bc90ad19666827b2080036cb902eb82498ff
-MISC ChangeLog 516 RMD160 2c669b8f777aa37e8cce1574a2a274f4e12e9583 SHA1 aca452b70990813703e624e9eb18d7add2d4c8c6 SHA256 8731a3949700d169180ea8efb111fea7bc19818c845f0979e828f042c9dd44ed
+EBUILD mozldap-6.0.6.ebuild 3380 RMD160 7cc85e245e863198a152e9ccbfaf75e705b76d9b SHA1 c31daa0ce15cf894ce9108e3ae9927ac31075739 SHA256 80b3fa7f0afd037d145d25845e09bc90ad19666827b2080036cb902eb82498ff
+MISC ChangeLog 598 RMD160 e06cfdb96f9ac459c75107e90cbf232f4543cd3a SHA1 fb83afb427cd8ca18957435de0ceb4e3e3b2ffa5 SHA256 a2580168153596e2a8ef26b003476de3942ad0f89475beea290f4e4966c20a3a
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-libs/mozldap/mozldap-6.0.6.ebuild b/dev-libs/mozldap/mozldap-6.0.6.ebuild
new file mode 100644
index 00000000..9a094a97
--- /dev/null
+++ b/dev-libs/mozldap/mozldap-6.0.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils multilib versionator
+
+DESCRIPTION="Mozilla LDAP C SDK"
+HOMEPAGE="http://wiki.mozilla.org/LDAP_C_SDK"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64  ~x86"
+IUSE="ipv6 debug sasl"
+
+DEPEND=">=dev-libs/nss-3.11.4
+	>=dev-libs/nspr-4.0.1
+	>=dev-libs/svrcore-4.0.0
+	sasl? ( dev-libs/cyrus-sasl )"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-6.0.4-pkgconfig.patch
+}
+
+src_compile() {
+	cd mozilla/directory/c-sdk
+
+	if use amd64 ; then
+		myconf="${myconf} --enable-64bit"
+	else
+		myconf=""
+	fi
+
+	if use ipv6; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	if use sals; then
+		myconf="${myconf} --with-sasl"
+	fi
+
+	myconf="${myconf} --libdir=/usr/$(get_libdir)/mozldap"
+
+	econf $(use_enable debug) \
+		--with-svrcore-inc=/usr/include/svrcore \
+		--with-svrcore-lib=/usr/$(get_libdir)/svrcore \
+		--enable-clu \
+		--enable-optimize \
+		${myconf} || die "econf failed"
+	make || die
+}
+
+src_install () {
+	# Their build system is royally fucked, as usual
+	cd "${S}"/mozilla/directory/c-sdk
+	sed -e "s,%libdir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
+	    -e "s,%prefix%,/usr,g" \
+	    -e "s,%major%,$(get_major_version ${PV}),g" \
+	    -e "s,%minor%,$(get_version_component_range 2 ${PV}),g" \
+	    -e "s,%submin%,$(get_version_component_range 3 ${PV}),g" \
+	    -e "s,%libsuffix%,$(get_major_version ${PV})$(get_version_component_range 2 ${PV}),g" \
+	    -e "s,%bindir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
+	    -e "s,%exec_prefix%,\$\{prefix\},g" \
+	    -e "s,%includedir%,\$\{exec_prefix\}/include/${PN},g" \
+	    -e "s,%NSPR_VERSION%,$(pkg-config --modversion nspr),g" \
+	    -e "s,%NSS_VERSION%,$(pkg-config --modversion nss),g" \
+	    -e "s,%SVRCORE_VERSION%,$(pkg-config --modversion svrcore),g" \
+	    -e "s,%MOZLDAP_VERSION%,${PV},g" \
+	    ${PN}.pc.in > ${PN}.pc
+	make install
+	rm -rf "${S}"/mozilla/dist/bin/lib*.so
+	rm -rf "${S}"/mozilla/dist/public/ldap-private
+
+	exeinto /usr/$(get_libdir)/mozldap
+	doexe "${S}"/mozilla/dist/lib/*so*
+	doexe "${S}"/mozilla/dist/lib/*.a
+	doexe "${S}"/mozilla/dist/bin/*
+	# move the headers around
+	insinto /usr/include/mozldap
+	doins "${S}"/mozilla/dist/public/ldap/*.h
+	# add sample config
+	insinto /usr/share/mozldap
+	doins "${S}"/mozilla/dist/etc/*.conf
+	#and while at it move them to files with versions-ending
+	#and link them back :)
+	cd "${D}"/usr/$(get_libdir)/mozldap
+	#create compatibility Link
+	ln -sf libldap$(get_major_version ${PV})$(get_version_component_range 2 ${PV}).so liblber$(get_major_version ${PV})$(get_version_component_range 2 ${PV}).so
+	#so lets move
+	for file in *.so; do
+		mv ${file} ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV})
+		ln -s ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) ${file}
+		ln -s ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) ${file}.$(get_major_version ${PV})
+	done
+	# cope with libraries being in /usr/lib/mozldap
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/mozldap" > "${D}"/etc/env.d/08mozldap
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}"/mozilla/directory/c-sdk/mozldap.pc
+}