diff --git a/app-admin/mmc-agent/ChangeLog b/app-admin/mmc-agent/ChangeLog
index 016ffbf..e3d5437 100644
--- a/app-admin/mmc-agent/ChangeLog
+++ b/app-admin/mmc-agent/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+* mmc-agent-2.3.2-r2 (17 Apr 2009)
+
+  17 Apr 2009; Mario Fetka <mario.fetka@gmail.com> mmc-agent-2.3.2-r2:
+  EAPI2 and test cleanup
+
   16 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
   mmc-agent-2.3.2-r1.ebuild:
   add die to do*
diff --git a/app-admin/mmc-agent/Manifest b/app-admin/mmc-agent/Manifest
index 77844d9..f43333e 100644
--- a/app-admin/mmc-agent/Manifest
+++ b/app-admin/mmc-agent/Manifest
@@ -4,5 +4,6 @@ AUX mmc-agent-2.3.2-printing-1.patch 33371 RMD160 f7064ec4dfc2e923c522f01190ca5d
 AUX mmc-agent.initd 438 RMD160 d7dc64366782ab0d6fe4347d6a169b88a4e03a49 SHA1 e4ae8808678161237703bbb63b144899c9a544c9 SHA256 922d0bacad3eda749f8807e3ae5c183f636fa93e0d41d7079e570c58ebccb879
 DIST mmc-agent-2.3.2.tar.gz 120949 RMD160 871b3b7766d69019de392e42ebf25a216d217c71 SHA1 1e7c634243c00c6b214f24c3467315d31a444215 SHA256 0ac8ff97818c58008cadb3c6b08dba39e42b078fea9d392fda649e036eabaea2
 EBUILD mmc-agent-2.3.2-r1.ebuild 1635 RMD160 774f66ecfc207a8c86dadc010f8d9d04b50d0dbf SHA1 1175dc65b8f3e5fadd3cedfd73249b91e8a24987 SHA256 f17934a3cd9623de2c1dd29d88857a16d392feb8c51db0cc69e5320ff5d3e17e
-MISC ChangeLog 1264 RMD160 6df49728b3033477d50a2b4389843119accf99bc SHA1 1673c08c69cba88aa7dd7417caddc7c4e46761f9 SHA256 ec446a54f2186ee79526d1c4ad41fc44cce9ac83dbbf953b8d1e65f78e3c4762
+EBUILD mmc-agent-2.3.2-r2.ebuild 1557 RMD160 fd12dd7afc50f7d37dd4d9e0291ec2509cc057ba SHA1 cfa7d9721d4b45a52499c481c99e1449844eeb3b SHA256 1ed12652595fc95f9f98be38721899ae6d811746fd7854687911243dd1d59d6d
+MISC ChangeLog 1397 RMD160 bebc14d8ccda75f9eb2f83aa4b6e38d1c5c1223e SHA1 ead7bf4650473188b88a1ffa2b3ff9de3fdec0e9 SHA256 ea79debe754971307e18cde0aa862a1ec6c9f9214e1bc2ab173fd056e8a1276b
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-admin/mmc-agent/mmc-agent-2.3.2-r2.ebuild b/app-admin/mmc-agent/mmc-agent-2.3.2-r2.ebuild
new file mode 100644
index 0000000..f70e63c
--- /dev/null
+++ b/app-admin/mmc-agent/mmc-agent-2.3.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit distutils
+
+DESCRIPTION="The MMC Agent and its Python plugins."
+HOMEPAGE="http://mds.mandriva.org/"
+SRC_URI="http://mds.mandriva.org/pub/mds/sources/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+SLOT="0"
+
+RDEPEND=">=dev-python/twisted-web-0.7.0
+	>=dev-python/python-ldap-2.2.1
+	>=dev-python/psycopg-2.0.2"
+
+DEPEND=">=dev-python/setuptools-0.6_rc1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.3.1-kerberos-1.patch
+	epatch "${FILESDIR}"/${PN}-2.3.2-printing-1.patch
+	epatch "${FILESDIR}"/${PN}-2.3.2-powerdns-1.patch
+}
+
+# from marienz's setuptools.eclass:
+src_install() {
+	"${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed"
+	dosbin bin/* || die "bin install failed"
+	insinto etc/mmc/agent/keys
+	doins -r conf/agent/keys/* || die "key install failed"
+	insinto etc/mmc/agent
+	doins -r conf/agent/*.ini || die "agent ini install failed"
+	insinto etc/mmc/plugins
+	doins -r conf/plugins/*.ini || die "plugins ini install failed"
+	insinto usr/share/doc/${P}
+	doins -r contrib || die "ldap schemas install failed"
+	dodoc Changelog || die "doc install failed"
+
+	newinitd "${FILESDIR}"/mmc-agent.initd mmc-agent
+}
+
+pkg_postinst() {
+	elog "To disable some plugin in your mmc environments, you have to set"
+	elog "disable to 1 in /etc/mmc/plugins/*.ini"
+	elog "(one config file per service)"
+	elog "You can't disable the base plugin."
+}