diff --git a/app-admin/mmc-web-pkgs/ChangeLog b/app-admin/mmc-web-pkgs/ChangeLog
index 32e0975..8025686 100644
--- a/app-admin/mmc-web-pkgs/ChangeLog
+++ b/app-admin/mmc-web-pkgs/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 May 2010; Mario Fetka <mario.fetka@gmail.com>
+  -mmc-web-pkgs-1.2.0.ebuild, -mmc-web-pkgs-1.2.0-r1.ebuild,
+  -mmc-web-pkgs-1.2.1_p121.ebuild, -mmc-web-pkgs-1.2.2_p133.ebuild,
+  -mmc-web-pkgs-1.2.3_p139.ebuild, -mmc-web-pkgs-1.2.4_p154.ebuild,
+  +mmc-web-pkgs-1.2.4_p154-r1.ebuild:
+  delete old and depend on new mmc-web-core package
+
   18 Feb 2010; Mario Fetka <mario.fetka@gmail.com>
   mmc-web-pkgs-1.2.0.ebuild, mmc-web-pkgs-1.2.0-r1.ebuild,
   mmc-web-pkgs-1.2.1_p121.ebuild, mmc-web-pkgs-1.2.2_p133.ebuild,
diff --git a/app-admin/mmc-web-pkgs/Manifest b/app-admin/mmc-web-pkgs/Manifest
index 83132fb..25eaea9 100644
--- a/app-admin/mmc-web-pkgs/Manifest
+++ b/app-admin/mmc-web-pkgs/Manifest
@@ -1,13 +1,4 @@
-DIST mmc-web-pkgs-1.2.0.tar.gz 17294 RMD160 841e03d44b71f1a0c87cb64f9098795014c8cd1a SHA1 27b1da9efd911a9b516be1c0b0f21b11a384be0c SHA256 ae59061d2720eb64eff520e17ef7264ede013d860e0316f18db4a5fa7562a3df
-DIST mmc-web-pkgs-1.2.1-121.tar.gz 21316 RMD160 0f85b462325d5fc0374e7eb61f28a36b86bd3085 SHA1 dc61c5868b2fd75672129d07016c6a1e4eb99a3e SHA256 0a809d126104535324faaa893c793b62a8965c43a6f196b5e61b155fd7e29087
-DIST mmc-web-pkgs-1.2.2-133.tar.gz 20973 RMD160 0c1c24cd81493d88118a886c2ab14f2757e4d48e SHA1 47f8c6727d28cd837af92e15c32842e85b5b9c45 SHA256 afe0c1215e6096dad4688b1e2b594501e3b26694d2d89d7229e6b3b1b3221978
-DIST mmc-web-pkgs-1.2.3-139.tar.gz 20951 RMD160 763c324af3b83f786d77c48980fefacb67759d66 SHA1 b5cf9fe903e6383ee612f6ba2ff3dfe922b6ed50 SHA256 5b283de10f3fefa6ef00d6f576ec2d9470e5e1343e46939ede69e600f7a4892d
 DIST mmc-web-pkgs-1.2.4-154.tar.gz 21248 RMD160 87701b67e4559d4f2b899685d2cc688228c0b00d SHA1 4e2836f7b9f1c31f7fa53078c32cb4488603df78 SHA256 f8912d5852d8f26dce9219d0a4445d0b15140ced70cc196ce584ea50966825df
-EBUILD mmc-web-pkgs-1.2.0-r1.ebuild 682 RMD160 e87e407e14802c0781f9c30c556d6dfa49200498 SHA1 396520833f0e864b6414d75720cd1d056d363a46 SHA256 b448328864788f1c4970f725387a5cd4acf2d64f23aefd0147e4eafb4d42f418
-EBUILD mmc-web-pkgs-1.2.0.ebuild 676 RMD160 533a6d8b45a0f23102dd788af86445c7267f3fa5 SHA1 54b706045d1d3e2ea0423a92e21137296c590096 SHA256 79b076e9647f0ae1de97f389aa2aa08494de003faec08b2508cc6ec3e9054129
-EBUILD mmc-web-pkgs-1.2.1_p121.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-EBUILD mmc-web-pkgs-1.2.2_p133.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-EBUILD mmc-web-pkgs-1.2.3_p139.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-EBUILD mmc-web-pkgs-1.2.4_p154.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-MISC ChangeLog 1555 RMD160 87f5dbd0e602282a65019d5d9b5a590a446066ee SHA1 910ab43805540b4692decf31b3277bf85299c4ce SHA256 14096025c7f4eb21f81a533ac1aed2fda05b9cbb15e1a327bbb42f83ef07e6db
+EBUILD mmc-web-pkgs-1.2.4_p154-r1.ebuild 780 RMD160 71eef61e35128f178d311517b673587e8b16ffe9 SHA1 aef28ff4473b21b94bfa462a43b4dfeb59797c6e SHA256 bed8a0e32c1d4393a6ffabe2207da1337290a858e10f582d31ca41df8ee1b5f3
+MISC ChangeLog 1894 RMD160 53e787a352a65dd65e02589a523f90cf08d36bd5 SHA1 cc7e97ff33d0f7fcc7b8a5147e6ac0472a38383b SHA256 0b4e84ee5893b60b2c0be3584afd72bc421bcc5e50daffabc952203f0b4476ec
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.0-r1.ebuild b/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.0-r1.ebuild
deleted file mode 100644
index 5c0a2d5..0000000
--- a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils depend.apache depend.php
-
-DESCRIPTION="Open Source Computer System Management !"
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/sources/${PV}/${P}.tar.gz
-	http://ftp.mars.arge.at/mds/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/lsb-release
-	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
-	>=app-admin/pulse2-mmc-plugins-${PV}"
-SLOT="0"
-
-need_php_httpd
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "install failed"
-}
diff --git a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.0.ebuild b/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.0.ebuild
deleted file mode 100644
index 4c8896d..0000000
--- a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils depend.apache depend.php
-
-DESCRIPTION="Open Source Computer System Management !"
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://mds.mandriva.org/pub/pulse2/sources/${PV}/${P}.tar.gz
-	http://ftp.mars.arge.at/mds/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/lsb-release
-	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
-	>=app-admin/pulse2-mmc-plugins-${PV}"
-SLOT="0"
-
-need_php_httpd
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-}
diff --git a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.1_p121.ebuild b/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.1_p121.ebuild
deleted file mode 100644
index 8290d84..0000000
--- a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.1_p121.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils depend.apache depend.php
-
-MY_P="${P/_p/-}"
-MY_PV="${PV/_p*/}"
-
-DESCRIPTION="Open Source Computer System Management !"
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/lsb-release
-	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
-	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
-SLOT="0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-need_php_httpd
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "install failed"
-}
diff --git a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.2_p133.ebuild b/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.2_p133.ebuild
deleted file mode 100644
index 8290d84..0000000
--- a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.2_p133.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils depend.apache depend.php
-
-MY_P="${P/_p/-}"
-MY_PV="${PV/_p*/}"
-
-DESCRIPTION="Open Source Computer System Management !"
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/lsb-release
-	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
-	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
-SLOT="0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-need_php_httpd
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "install failed"
-}
diff --git a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.3_p139.ebuild b/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.3_p139.ebuild
deleted file mode 100644
index 8290d84..0000000
--- a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.3_p139.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils depend.apache depend.php
-
-MY_P="${P/_p/-}"
-MY_PV="${PV/_p*/}"
-
-DESCRIPTION="Open Source Computer System Management !"
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/lsb-release
-	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
-	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
-SLOT="0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-need_php_httpd
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "install failed"
-}
diff --git a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.4_p154.ebuild b/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.4_p154-r1.ebuild
similarity index 87%
rename from app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.4_p154.ebuild
rename to app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.4_p154-r1.ebuild
index 8290d84..d3ca3a5 100644
--- a/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.4_p154.ebuild
+++ b/app-admin/mmc-web-pkgs/mmc-web-pkgs-1.2.4_p154-r1.ebuild
@@ -12,14 +12,14 @@ MY_PV="${PV/_p*/}"
 DESCRIPTION="Open Source Computer System Management !"
 HOMEPAGE="http://pulse2.mandriva.org/"
 SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
+	http://ftp.disconnected-by-peer.at/mds/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
 IUSE=""
 DEPEND="sys-apps/lsb-release
 	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
+RDEPEND=">=app-admin/mmc-web-core-2.3.1
 	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
 SLOT="0"