diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index bbae586..f043e45 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.154 2009/05/29 23:30:28 vapier Exp $
 
+  08 Jul 2009; Mario Fetka <mario.fetka@gmail.com> dhcp-3.1.2.ebuild,
+  dhcp-4.0.1.ebuild:
+  new upstream release
+
   08 Jul 2009; Mario Fetka <mario.fetka@gmail.com>
   files/dhcp-3.1.2.ebuild.patch, files/dhcp-4.0.1.ebuild.patch:
   correct ebuild patch
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 583ee7e..4e0de6f 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -29,9 +29,9 @@ AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecd
 AUX dhcrelay.init 736 RMD160 04566b87bd6dbb8bb754b26409ca30b878ef3ca3 SHA1 72742b308314b2e1476b27e94212fbf4d179adc4 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c
 DIST dhcp-3.1.2.tar.gz 799626 RMD160 026ac48b176ec273397fafa8a834a21fd6331681 SHA1 a60cccec2402a35025ddaafc8ac896595188560e SHA256 80daba1e4ac220a0945778aa3c1c9eb7860c4426645660bebb8ed35a3231a2fb
 DIST dhcp-4.0.1.tar.gz 1050570 RMD160 a9764a76d105778362fe4b58e77783331ee3448a SHA1 7d813740ab4a64e474f1c01b1395617987532ed1 SHA256 965d09a7759250eff7d6d06d37425ea085c14edb5b405f8357ef5ec72ded28ef
-DIST ldap-for-dhcp-3.1.2-1.1.tar.gz 39022 RMD160 389dfddc2a599f799a4d2d1f6659013509495462 SHA1 7eb3d5332b75462a148fc1361b8a661049457956 SHA256 923ea17ae32c632156dca1ee0dea98c258a65732dd4623f065feb9dfabc6fed8
-DIST ldap-for-dhcp-4.0.1-2.1.tar.gz 38676 RMD160 0afe265b939e15d352c998514c8a1a8fba2c247e SHA1 0487b2194bb2841e2bb50e8a88c37f8e7b06390f SHA256 3c155cd22cfa1cfbab2867bb329d306eb3b23c9fcc306e00a70c003ee27031ae
-EBUILD dhcp-3.1.2.ebuild 8400 RMD160 faa8d8e8d792dd5c3a187a3185ca109827170f83 SHA1 3b7683cee5da98186dc8d87064471b30ea5dbc61 SHA256 1d3df03c3c291987041651e25965140e1133be6bc6e0171a771bd8dce4403d9e
-EBUILD dhcp-4.0.1.ebuild 7515 RMD160 1b163148e52c5dcc6353476687ddf99726ea7407 SHA1 ea32dd0ad60be0a000c774750d42d3a517f7addb SHA256 2ef83f7642d97ffe4f8657922355d20ea96802bc756cd6fb4fb767448d5ab9a6
-MISC ChangeLog 28131 RMD160 aa1a79e5d07e1d30fcf6c58f83d0a1587cd42b36 SHA1 8fffbf627f8396b65dc113d63481c28199376694 SHA256 b8cf7d69d2cf8685954bb5ffca3338f9a2bc2eb84b30bc8f628d5fc495655745
+DIST ldap-for-dhcp-3.1.2-2.tar.gz 39752 RMD160 96d2f469b1349485c0202012697222911b81abe8 SHA1 023d12eeb148ad493e252edbfd112d19c9d0cecd SHA256 afd30a30d72a17a4d8ae1a27c247711f03b30b5e270bdcf9f521695b55b28db7
+DIST ldap-for-dhcp-4.0.1-3.tar.gz 39117 RMD160 977ec08ec0213e1a53d0dd5b3b08a234172dbd22 SHA1 8bc692bb2017c1b5ff35d73c10e5a2e4ed44e559 SHA256 161f5cd479ba0789d139ef59d101244fa7c880c3d1c13cbbbbae978004a30a18
+EBUILD dhcp-3.1.2.ebuild 8439 RMD160 af0143fd42720fc2ff28d72453023606a0be0964 SHA1 145459d45b160cb33b26165627e10e2ef1f73b7d SHA256 1ce562b1585743391b671e808d30a7572cd17ad0a8c6f20371fe07ed14b4bdb1
+EBUILD dhcp-4.0.1.ebuild 7591 RMD160 e040ba3ab002c67f8a09be6b05eca762c602bad8 SHA1 848ca4332e76e68e253faff09cb8bbcde759369a SHA256 135a13f083d48eb6cb28ce859ce026a97141e6f0920767a0ef2dedf22c7e8391
+MISC ChangeLog 28246 RMD160 cb6ddf8ad15b0ed5cdfb0c7f64d765fc65e5bb04 SHA1 5f0980eb2b2c111ae1f6003455b4c43f0c4a7148 SHA256 cc6f791e1362d37c1ef6cf457441df20670d0f43c9181ccc9b03bc3fbcef0871
 MISC metadata.xml 358 RMD160 97ecd4b6ee0a24352a71a66d5ad4fd82481156b4 SHA1 d80da2cf7c6892cdad6b681fda29e46472d68871 SHA256 8665f24cdfcc09576b595f8bd257333ff5f9ea7ee0ca2925ba6fb74d90e12415
diff --git a/net-misc/dhcp/dhcp-3.1.2.ebuild b/net-misc/dhcp/dhcp-3.1.2.ebuild
index f9944f3..15e4553 100644
--- a/net-misc/dhcp/dhcp-3.1.2.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.2.ebuild
@@ -4,7 +4,7 @@
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
-LDAP_PV="3.1.2-1.1"
+LDAP_PV="3.1.2-2"
 
 MY_PV="${PV//_alpha/a}"
 MY_PV="${MY_PV//_beta/b}"
@@ -14,18 +14,18 @@ MY_LDAP_PV="${LDAP_PV//-*/}"
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ldap? ( http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-${LDAP_PV}.tar.gz 
+	ldap? ( http://cloud.github.com/downloads/dcantrell/ldap-for-dhcp/ldap-for-dhcp-${LDAP_PV}.tar.gz
 		http://ftp.mars.arge.at/pub/ldap-for-dhcp-${LDAP_PV}.tar.gz )"
 
 LICENSE="isc-dhcp"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="doc minimal static selinux kernel_linux ldap ssl"
+IUSE="doc minimal static selinux kernel_linux ldap"
 
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
 	kernel_linux? ( sys-apps/net-tools )
 	ldap? ( net-nds/openldap
-		ssl? ( dev-libs/openssl ) )"
+		dev-libs/openssl )"
 
 PROVIDE="virtual/dhcpc"
 
@@ -73,7 +73,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
 
 	# Ldap patch for dhcp
-	epatch "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}/dhcp-${MY_LDAP_PV}"-ldap.patch
+	# buggy build system so don*t patch when no ldap build
+	use ldap && epatch "${WORKDIR}/ldap-for-dhcp-${LDAP_PV}/dhcp-${MY_LDAP_PV}"-ldap.patch
 
 	# Brand the version with Gentoo
 	# include revision if >0
@@ -131,7 +132,7 @@ src_compile() {
 	END
 	if use ldap ; then
 		echo "#define LDAP_CONFIGURATION" >> includes/site.h
-		use ssl && echo "#define USE_SSL" >> includes/site.h
+		echo "#define USE_SSL" >> includes/site.h
 	fi
 
 	cat <<-END > site.conf
@@ -154,7 +155,7 @@ src_compile() {
 	END
 	if use ldap ; then
 		echo "LDAPLIB = -lldap" >> site.conf
-		use ssl && echo "SSLLIB = -lcrypto -lssl" >> site.conf
+		echo "SSLLIB = -lcrypto -lssl" >> site.conf
 	fi
 
 	./configure --copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" \
diff --git a/net-misc/dhcp/dhcp-4.0.1.ebuild b/net-misc/dhcp/dhcp-4.0.1.ebuild
index e96dd29..7ccd59f 100644
--- a/net-misc/dhcp/dhcp-4.0.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.0.1.ebuild
@@ -4,7 +4,7 @@
 
 inherit eutils flag-o-matic autotools
 
-LDAP_PV="4.0.1-2.1"
+LDAP_PV="4.0.1-3"
 
 MY_PV="${PV//_alpha/a}"
 MY_PV="${MY_PV//_beta/b}"
@@ -15,8 +15,8 @@ MY_LDAP_PV="${LDAP_PV//-*/}"
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ldap? ( http://dcantrel.fedorapeople.org/dhcp/ldap-patch/ldap-for-dhcp-${LDAP_PV}.tar.gz
-		http://ftp.mars.arge.at/pub/ldap-for-dhcp-${LDAP_PV}.tar.gz )"
+	http://cloud.github.com/downloads/dcantrell/ldap-for-dhcp/ldap-for-dhcp-${LDAP_PV}.tar.gz
+		http://ftp.mars.arge.at/pub/ldap-for-dhcp-${LDAP_PV}.tar.gz"
 
 LICENSE="isc-dhcp"
 SLOT="0"
@@ -116,6 +116,11 @@ src_unpack() {
 }
 
 src_compile() {
+	myconf=""
+	if use ldap; then
+		myconf="${myconf} --with-ldap"
+		use ssl && myconf="${myconf} --with-ldapcrypto"
+	fi
 	econf \
 		--enable-paranoia \
 		--sysconfdir /etc/dhcp \
@@ -125,8 +130,7 @@ src_compile() {
 		--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
 		--with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \
 		$(use_enable ipv6 dhcpv6) \
-		$(use_with ldap) \
-		$(use_with ssl ldapcrypto) \
+		${myconf} \
 		|| die
 
 	emake || die "compile problem"