diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 8aca517..c372b5b 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,3 +1,5 @@
 DIST python-ldap-2.3.8.tar.gz 99884 RMD160 733c075dbb48cdb097aa707a6f96e9622bd136bc SHA1 d00324dc9f3cc8a2fda9bf6b426d651ada86f8d4 SHA256 059aa79791576f878f95174b57bb2e72915b585bd3a84ca99ea4e7ddfc874b47
+DIST python-ldap-2.3.9.tar.gz 108209 RMD160 25d8555f548acdb418725f966f9ee94730f4ed77 SHA1 8d558259bfcda02e6b6be79e8dea18f744367dd5 SHA256 62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4
 DIST python-ldap-docs-html-2.3.7.tar.gz 90650 RMD160 51a08f7008e36c360007f271a2e93de1b3f1adfa SHA1 246bcd4c164aa7f8cde9caae82d1a72fee5504ab SHA256 0e15675025504904cdbc2c5b23deba9149ab8b199b31cf7d532db57e4ef09102
 EBUILD python-ldap-2.3.8.ebuild 1807 RMD160 7438391846e0b14aa40aca05f0b5642e6a7b3e46 SHA1 c924368dafff3d14c685ad7c02d9484085599792 SHA256 9bd9fb3ea92baab2599792b505438959747b9c93efea8fe4f195a22ef61814e3
+EBUILD python-ldap-2.3.9.ebuild 1807 RMD160 7438391846e0b14aa40aca05f0b5642e6a7b3e46 SHA1 c924368dafff3d14c685ad7c02d9484085599792 SHA256 9bd9fb3ea92baab2599792b505438959747b9c93efea8fe4f195a22ef61814e3
diff --git a/dev-python/python-ldap/python-ldap-2.3.9.ebuild b/dev-python/python-ldap/python-ldap-2.3.9.ebuild
new file mode 100644
index 0000000..6b52de0
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.3.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.5.ebuild,v 1.2 2009/05/10 16:15:15 ssuominen Exp $
+
+NEED_PYTHON=2.4
+
+inherit distutils eutils multilib
+
+P_DOC="${PN}-docs-html-2.3.7"
+
+DESCRIPTION="Various LDAP-related Python modules"
+SRC_URI="http://pypi.python.org/packages/source/p/${PN}/${P}.tar.gz
+	doc? ( http://www.python-ldap.org/doc/${P_DOC}.tar.gz )"
+HOMEPAGE="http://python-ldap.sourceforge.net/"
+SLOT="0"
+LICENSE="PYTHON"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples sasl ssl"
+
+RDEPEND=">=net-nds/openldap-2.3
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${DEPEND}
+	dev-python/setuptools"
+
+# Installs some script-files directly in site-packages
+PYTHON_MODNAME="/"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	#epatch "${FILESDIR}"/${P}-gcc44.patch
+
+	# Note: we can't add /usr/lib and /usr/lib/sasl2 to library_dirs due to a bug in py2.4
+	sed -e "s:^library_dirs =.*:library_dirs =:" \
+		-e "s:^include_dirs =.*:include_dirs = /usr/include /usr/include/sasl:" \
+		-e "s:\(extra_compile_args =\).*:\1\nextra_link_args = -Wl,-rpath=/usr/$(get_libdir) -Wl,-rpath=/usr/$(get_libdir)/sasl2:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl ; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+
+	sed -e "s:^libs = .*:libs = lber resolv ${mylibs}:" \
+		-e "s:^compile.*:compile = 0:" \
+		-e "s:^optimize.*:optimize = 0:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+}
+
+src_install() {
+	distutils_src_install
+	use doc && dohtml -r "${WORKDIR}/${P_DOC/html-/}"/*
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r Demo
+	fi
+}