diff --git a/app-admin/pulse2-package-server/ChangeLog b/app-admin/pulse2-package-server/ChangeLog
index baad976..dfb22ee 100644
--- a/app-admin/pulse2-package-server/ChangeLog
+++ b/app-admin/pulse2-package-server/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+* pulse2-package-server-1.2.0-r1 (17 Apr 2009)
+
+  17 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
+  pulse2-package-server-1.2.0-r1:
+  make it EAPI2
+
   16 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
   pulse2-package-server-1.2.0.ebuild:
   add die to do*
diff --git a/app-admin/pulse2-package-server/Manifest b/app-admin/pulse2-package-server/Manifest
index f62fd6c..2e38238 100644
--- a/app-admin/pulse2-package-server/Manifest
+++ b/app-admin/pulse2-package-server/Manifest
@@ -1,5 +1,6 @@
 AUX pulse2-package-server.initd 502 RMD160 d59eabd0b308763f84c5c1122d3be51efa9b936b SHA1 8baca6587a44a0e5a703cbbdcb49d7047bbf830b SHA256 fdbeb24053631223c1634e85712d16b24d177a0309d2bacb28562ca02e7fe4e4
 DIST pulse2-package-server-1.2.0.tar.gz 43959 RMD160 8bf50fe814e1d621b5444eecb66ff3028bb262e9 SHA1 1e09bb177d799345cc0d72007694b952f62a7b90 SHA256 6c8f2d900afd14a5edf414305fa5cafc01096eb454d2448b1f7f6903beb21132
+EBUILD pulse2-package-server-1.2.0-r1.ebuild 1100 RMD160 f9bac8d5a3023af5822ab3acb70233930eb58d68 SHA1 5a0483995c98c5b40acab7291d44f176810018fd SHA256 3878037a97c35a3c1daccdfefe791a6459b1c7c441cf41c690186d44acb79003
 EBUILD pulse2-package-server-1.2.0.ebuild 1152 RMD160 6b2658e8e0ab7cec23a15cdcdcda87fe27fcb4bc SHA1 c8ac6859bfd89ea4aeadcb2fcf898d4de2cc8a31 SHA256 e141bb627a710d9530c3ff2c4f331d86d93fa86c60aeffa491dd1ecbdd2e45a9
-MISC ChangeLog 593 RMD160 fe10cd0b6c7339497eee222607673c4948c754ac SHA1 a5423f4b3b979b30cdbae9046f631ec7aa4d3378 SHA256 cb0a42f2c1242d323acaafde5aa43a9b39bf674a8c074e0e44916d8d5785430e
+MISC ChangeLog 743 RMD160 0360a587abfba5644b380321e175092a12bd53cd SHA1 dfff0b428ed93b6e0a16dc7b9f36dde58e6e036d SHA256 a637ee9b9cd6724711056f9710dc4ce1663cdf09791c68ec5c43f39a78308a53
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/app-admin/pulse2-package-server/pulse2-package-server-1.2.0-r1.ebuild b/app-admin/pulse2-package-server/pulse2-package-server-1.2.0-r1.ebuild
new file mode 100644
index 0000000..6dcdb72
--- /dev/null
+++ b/app-admin/pulse2-package-server/pulse2-package-server-1.2.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit distutils
+
+DESCRIPTION="Open Source Computer System Management and its Python plugins."
+HOMEPAGE="http://pulse2.mandriva.org/"
+SRC_URI="http://pulse2.mandriva.org/pub/pulse2/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
+	>=app-admin/pulse2-common-1.2.0"
+
+DEPEND=">=dev-python/setuptools-0.6_rc1"
+
+# from marienz's setuptools.eclass:
+src_install() {
+	"${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed"
+	dosbin bin/pulse2-package-server || die "bin install failed"
+	insinto etc/mmc/pulse2/pserver/keys
+	doins -r conf/keys/* || die "key install failed"
+	insinto etc/mmc/pulse2/pserver
+	doins -r conf/*.ini || die "ini install failed"
+	insinto usr/share/doc/${P}
+	doins -r contrib || die "config samples install failed"
+	dodoc Changelog
+
+	newinitd "${FILESDIR}"/pulse2-package-server.initd pulse2-package-server
+}
+