diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index 7af25a5..4da6e20 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.75 2010/01/10 17:41:52 ranger Exp $
 
+  01 May 2010; Mario Fetka <mario.fetka@gmail.com>
+  +python-ldap-2.3.11.ebuild:
+  Bump hack
+
   18 Feb 2010; Mario Fetka <mario.fetka@gmail.com>
   python-ldap-2.3.10.ebuild:
   add arm keyword
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 40835df..e4d53ab 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,6 +1,8 @@
 AUX python-ldap-2.3.10-ldap-reconnect-1.patch 732 RMD160 2a4880f4131a787aad061aeac16f672cf85bba92 SHA1 cd59a2724ad31521b1c9a44a53f36e68bad357cd SHA256 16f5cbf4cebc09e5903badf5f9c321dcaf07712bd2a45dfdd0f7e6410eca5f7d
 DIST python-ldap-2.3.10.tar.gz 112840 RMD160 1784203fdb90b484c4d11edc032883ae75a64c84 SHA1 b15c15a71956c5f51a3642e513c206cf03d6248e SHA256 3c3bbf723440f2b8c7102994c9cd4666307df3d3538e110fff2d03681e7f284f
+DIST python-ldap-2.3.11.tar.gz 119459 RMD160 1d8059be08bc6f17b114949191bc135805e0050f SHA1 bcc77e242b19092e4e2917e380be497ff4c9ce74 SHA256 bed37b5663b3f61e238477f261dbf0402e613c1ac0a4828de4e2e886850e60bf
 DIST python-ldap-docs-html-2.3.7.tar.gz 90650 RMD160 51a08f7008e36c360007f271a2e93de1b3f1adfa SHA1 246bcd4c164aa7f8cde9caae82d1a72fee5504ab SHA256 0e15675025504904cdbc2c5b23deba9149ab8b199b31cf7d532db57e4ef09102
 EBUILD python-ldap-2.3.10.ebuild 1944 RMD160 cbc7d90123927bf44c6fcd87f0c67c4dc198a588 SHA1 7e869eff54c295dfab8562bbd1f4a9128362efba SHA256 9629e12855b066cb48dd9c1f8e60afefc22a64bde4dfeb7ce19b038c99708d44
-MISC ChangeLog 9799 RMD160 11a85e1085ed9b5b69a86c285ca6cf65ef1e0a5d SHA1 d854e3b48b0e6a7e23d45f00f0279e6e0d27d239 SHA256 964582c85883d0cf58ca4d16701d7c98c961f6aa4f36bbba03e0cc1ab715ffd7
+EBUILD python-ldap-2.3.11.ebuild 1944 RMD160 cbc7d90123927bf44c6fcd87f0c67c4dc198a588 SHA1 7e869eff54c295dfab8562bbd1f4a9128362efba SHA256 9629e12855b066cb48dd9c1f8e60afefc22a64bde4dfeb7ce19b038c99708d44
+MISC ChangeLog 9893 RMD160 463646a1fd7b364ddb52b9dc54121eb4c6628bb9 SHA1 c8bf6f4c82f8c37779ffd1534bd88dfa22f600d7 SHA256 7da88a82b477ecbdb37652ef74bc6930dc845e36c3824ff2c555d818989d19c2
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/python-ldap/python-ldap-2.3.11.ebuild b/dev-python/python-ldap/python-ldap-2.3.11.ebuild
new file mode 100644
index 0000000..ec363bb
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.3.11.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 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.10.ebuild,v 1.7 2010/01/10 17:41:52 ranger Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils multilib
+
+DOC_P="${PN}-docs-html-2.3.7"
+
+DESCRIPTION="Various LDAP-related Python modules"
+SRC_URI="http://pypi.python.org/packages/source/p/python-ldap/${P}.tar.gz
+	doc? ( http://www.python-ldap.org/doc/${DOC_P}.tar.gz )"
+HOMEPAGE="http://python-ldap.sourceforge.net/ http://pypi.python.org/pypi/python-ldap"
+
+SLOT="0"
+LICENSE="PYTHON"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="doc examples sasl ssl"
+
+RDEPEND=">=net-nds/openldap-2.4
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${DEPEND}
+	dev-python/setuptools"
+RESTRICT_PYTHON_ABIS="3.*"
+
+DOCS="CHANGES README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/python-ldap-2.3.10-ldap-reconnect-1.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}/${DOC_P}"/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r Demo
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize dsml.py ldapurl.py ldif.py ldap
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}