diff --git a/mail-mta/bongo/Manifest b/mail-mta/bongo/Manifest
index a9277c8..c52d3ae 100644
--- a/mail-mta/bongo/Manifest
+++ b/mail-mta/bongo/Manifest
@@ -1,4 +1,6 @@
 AUX 70bongo 30 RMD160 f88bfbb75ec6605b5df06aed861a13b01c094466 SHA1 f1d44d8fab4e7495ec38e85047f7e800cdfc1965 SHA256 d0ee5aef8f668f6341f2a7fa61b758c62ab5f4e81ef252e9fa4858ed09eea12e
+AUX bongo-0.4.0-libical-1.patch 6121 RMD160 b3093329fdd413d015499b5464843285793401f3 SHA1 ccf81dbb4d46a5d60d1c0debb9b63fea6986eeeb SHA256 170576b12d9dea7d1a2e47a3914a55c35ed4147ed65be73481e777fd3467ae1a
+AUX bongo-0.4.0-no-werror-1.patch 593 RMD160 17e0f01a35c15973b71e492885ba713b0669ca1f SHA1 71deb6ce4752525dc63841b8c3d5f2bc0de58990 SHA256 9094e4c89eddcdffcb37a209cf5b7a4b23469c9404c0dd355b458c5a6e58a46b
 AUX bongo.conf.d 319 RMD160 52a3753da81e87716d80091fe09ac2a6027123b2 SHA1 c40625f749819ae138372e917562734cdc47afba SHA256 6e1386658d9751f892d1dbb7f43f3606b40200f702d5c26d1592ab327f6205e8
 AUX bongo.init 795 RMD160 17822d677d9861994229d7154bddec29221cc11c SHA1 e017a66f80afd34956d3679b92c287f5ee1aa418 SHA256 61b4bd024eda1bda2cbb095d7b7e43df4c3007715a9b331e9638d8e9a11bd234
 AUX mailer.conf 301 RMD160 5fd76d7292dd4df1157c76c612167b741daed16a SHA1 4f5cabe3cefa47847cfb65d834ac11af477bedf8 SHA256 36f457545e77902a195e111fbec2bff272f21d53113d9be34d826630616dc0da
@@ -19,7 +21,8 @@ EBUILD bongo-0.2.93.ebuild 2579 RMD160 a09858fa259fab5fccadfe02ed6ce9e1d50a641f
 EBUILD bongo-0.2.94.ebuild 2579 RMD160 a09858fa259fab5fccadfe02ed6ce9e1d50a641f SHA1 df0a2974141ae0fe1478cd701a8f5cbe8966307d SHA256 f7b36110f4e73050ee864d345ba34205e34172d3fcbf3aab36872fdbac10acbb
 EBUILD bongo-0.3.0.ebuild 2579 RMD160 a09858fa259fab5fccadfe02ed6ce9e1d50a641f SHA1 df0a2974141ae0fe1478cd701a8f5cbe8966307d SHA256 f7b36110f4e73050ee864d345ba34205e34172d3fcbf3aab36872fdbac10acbb
 EBUILD bongo-0.3.1.ebuild 2579 RMD160 9d4c19d08af24286a622be054d79c1e2170ea11f SHA1 c8da39f21b315337b808b2db7020ebb6c7408080 SHA256 16d4b973d2be6a4bf6bacdfaa6421c3446212c55e4730e2c30fc4d0e8a176020
+EBUILD bongo-0.4.0-r1.ebuild 2667 RMD160 5678ac49e63a22d1a850266e8bb9df12aad97261 SHA1 cc2d0d0f12d20ecbb13da233ecd63ecbb9583666 SHA256 21480898f2b19fcb728f8663704d5aa7dc0e2f473f3d846f06879d6cc65ac2b9
 EBUILD bongo-0.4.0.ebuild 2579 RMD160 9d4c19d08af24286a622be054d79c1e2170ea11f SHA1 c8da39f21b315337b808b2db7020ebb6c7408080 SHA256 16d4b973d2be6a4bf6bacdfaa6421c3446212c55e4730e2c30fc4d0e8a176020
-EBUILD bongo-9999.ebuild 2735 RMD160 d54ed3e34d0f7c8aee5cb481805c9e359a8fb8f1 SHA1 bf9ba8760d68d720b08ef4de81199706dc1de979 SHA256 1082f072bf8e4d8ccc3b4620be90a53087e3d1699a2337df50fef71738592940
+EBUILD bongo-9999.ebuild 2736 RMD160 fb0d7aec2b29cce2abac7b1ae22acbd91f814e77 SHA1 077b341859c2a794cc66917a2257c9c3a0584841 SHA256 6e8c2c02f3bf5f2a0dab1a63a30a15dd09a428406f006b5449418341ec8ea5aa
 MISC ChangeLog 334 RMD160 35e9dcdaf375966174aeaccd5a174685fd38364c SHA1 27ee68e62cbe5fb5182570bb8a1837b8375c9faa SHA256 5808184cfe7f98d754f9cd9b92d51e0df6e8ff56085d417180ec738854a0d9c2
 MISC metadata.xml 224 RMD160 a75b1683331a8874b18170c82f559bce6877f626 SHA1 da1ebf5ff592428b014945c5ccd1316778f39092 SHA256 de22a32e0eb75abae4c9d09b297c10d3597e4162861d73140fa6db97aa61f02f
diff --git a/mail-mta/bongo/bongo-9999.ebuild b/mail-mta/bongo/bongo-9999.ebuild
index 87a98c8..298884c 100644
--- a/mail-mta/bongo/bongo-9999.ebuild
+++ b/mail-mta/bongo/bongo-9999.ebuild
@@ -2,76 +2,72 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+
+EAPI="2"
+
 ESVN_REPO_URI="http://svn.gna.org/svn/${PN}/trunk"
 
-WANT_AUTOMAKE="1.9"
-
-inherit autotools eutils mailer multilib flag-o-matic subversion
+inherit eutils multilib flag-o-matic autotools subversion
 
 DESCRIPTION="A calendar and webmail application, which includes its own MTA"
 
+#SRC_URI="http://download.gna.org/bongo/release/${P}.tar.bz2"
 HOMEPAGE="http://bongo-project.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
 
-IUSE="libgcrypt"
+IUSE="libgcrypt mailwrapper"
 
 KEYWORDS=""
 
-RDEPEND="net-nds/openldap
-		net-libs/gnutls
-		net-misc/curl
-		>=dev-db/sqlite-3
-		libgcrypt? ( dev-libs/libgcrypt )
-		!dev-cpp/clucene"
+PROVIDE="virtual/mta"
+DEPEND="net-nds/openldap
+	net-libs/gnutls
+	>=dev-cpp/clucene-0.9.17
+	net-misc/curl
+	>=dev-db/sqlite-3
+	>=dev-libs/libical-0.40
+	dev-python/lxml
+	libgcrypt? ( dev-libs/libgcrypt )"
 
-# BLOCK CLUCENE DEP UNTIL THE 64bit BUG IS FIXED UPSTREAM
-		#dev-cpp/clucene
-	
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger"
 
 pkg_setup() {
 	enewgroup bongo
 	enewuser bongo -1 -1 -1 bongo
-	filter-ldflags -Wl,--as-needed --as-needed
+#	filter-ldflags -Wl,--as-needed --as-needed
+}
+
+src_prepare() {
+#	epatch ${FILESDIR}/bongo-0.4.0-libical-1.patch
+#	epatch ${FILESDIR}/bongo-0.4.0-no-werror-1.patch
+	eautoreconf
+}
+
+src_configure() {
+	use libgcrypt && myconf="--with-libgcrypt-prefix=/usr"
+	econf --with-user=bongo \
+		--with-clucene=/usr \
+		--with-sqlite3=/usr \
+		--with-libcurl=/usr \
+		${myconf} || die
 }
 
 src_compile() {
-	use libgcrypt && myconf="${myconf} --with-libgcrypt-prefix=/usr"
-
-	./autogen.sh \
-		--prefix=/usr \
-		--with-user=bongo \
-		--localstatedir=/var/lib \
-		--sysconfdir=/etc \
-		--libdir=/usr/$(get_libdir) \
-		--with-sqlite3=/usr \
-		--with-sqlite3-libdir=/usr/$(get_libdir) \
-		--with-libcurl=/usr \
-		${myconf} || die
-
-# BLOCK CLUCENE DEP UNTIL THE 64bit BUG IS FIXED UPSTREAM
-		#--with-clucene=/usr \
-		#--with-clucene-libdir=/usr/$(get_libdir) \
-
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make failed"
+	emake DESTDIR="${D}" install || die "make failed"
 	
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bongo.init bongo
-
-	dodir /etc/conf.d
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bongo.conf.d bongo
-
-	dodir /etc/env.d
-	insinto /etc/env.d
-	newins ${FILESDIR}/70bongo 70bongo
+	newinitd ${FILESDIR}/bongo.init bongo
+	newconfd ${FILESDIR}/bongo.conf.d bongo
+	newenvd ${FILESDIR}/70bongo 70bongo
 
 	dodir /var/lib/bongo
 	keepdir /var/lib/bongo
@@ -83,11 +79,14 @@ src_install() {
 	fowners bongo:bongo /var/run/bongo
 	fperms 770 /var/run/bongo
 
-	if use mailwrapper ; then
+
+	if use mailwrapper
+	then
 		dosym /usr/sbin/bongo-sendmail /usr/bin/sendmail.bongo-sendmail
 		dosym /usr/sbin/bongo-sendmail /usr/bin/mailq.bongo-sendmail
 		dosym /usr/sbin/bongo-sendmail /usr/bin/newaliases.bongo-sendmail
-		mailer_install_conf
+		insinto /etc/mail
+		doins "${FILESDIR}"/mailer.conf
 	else
 		dosym /usr/sbin/bongo-sendmail /usr/sbin/sendmail
 		dosym /usr/sbin/bongo-sendmail /usr/lib/sendmail
@@ -100,7 +99,7 @@ src_install() {
 pkg_postinst() {
 	elog "Bongo must be setup."
 	elog "Please run:"
-	elog "  /usr/sbin/bongo-setup"
+	elog "  emerge /usr/sbin/bongo-setup"
 	elog ""
 	elog "For more information on bongo-setup run /usr/sbin/bongo-setup --help"
 	elog ""
@@ -112,5 +111,6 @@ pkg_postinst() {
 }
 
 pkg_config() {
+	einfo "Setting up Bongo..."
 	/usr/sbin/bongo-setup
 }