diff --git a/app-admin/mmc-web-msc/ChangeLog b/app-admin/mmc-web-msc/ChangeLog
index df716a1..7eb8c7f 100644
--- a/app-admin/mmc-web-msc/ChangeLog
+++ b/app-admin/mmc-web-msc/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-msc-1.2.0.ebuild, -mmc-web-msc-1.2.0-r1.ebuild,
+  -mmc-web-msc-1.2.1_p583.ebuild, -mmc-web-msc-1.2.2_p595.ebuild,
+  -mmc-web-msc-1.2.3_p607.ebuild, -mmc-web-msc-1.2.4_p635.ebuild,
+  +mmc-web-msc-1.2.4_p635-r1.ebuild:
+  delete old and depend on new mmc-web-core package
+
   18 Feb 2010; Mario Fetka <mario.fetka@gmail.com> mmc-web-msc-1.2.0.ebuild,
   mmc-web-msc-1.2.0-r1.ebuild, mmc-web-msc-1.2.1_p583.ebuild,
   mmc-web-msc-1.2.2_p595.ebuild, mmc-web-msc-1.2.3_p607.ebuild,
diff --git a/app-admin/mmc-web-msc/Manifest b/app-admin/mmc-web-msc/Manifest
index 06090c7..0a148eb 100644
--- a/app-admin/mmc-web-msc/Manifest
+++ b/app-admin/mmc-web-msc/Manifest
@@ -1,13 +1,4 @@
-DIST mmc-web-msc-1.2.0.tar.gz 268471 RMD160 6f1371930c6f151b1ad5b8aee4046695109e4850 SHA1 ac3c3e9ace58bb6b605ece497b0117d89ffa250f SHA256 548a3c9308fd6c01a6bb89f2b4fddc226f5bbdda2b458d09c203252fbe6f63dc
-DIST mmc-web-msc-1.2.1-583.tar.gz 308760 RMD160 af29a1c5c483a295f19074f91947efb815f05928 SHA1 6a8fe54030b27d6b8dfd2b1c4bd6b5bda6ef2104 SHA256 1cf24bcc10de657ba51cb9c780d22c67843ee7cbd95ea072619d200705047d43
-DIST mmc-web-msc-1.2.2-595.tar.gz 312534 RMD160 c416b1fea3b7b2f8f988264484333947e1845ead SHA1 7e87a4b98cc637480f0c587261089eb05332ff9f SHA256 eb31fbdaf6b550831414b4aeab7a0214943f68a62f81b137b01f9165f3f5ed0f
-DIST mmc-web-msc-1.2.3-607.tar.gz 314402 RMD160 4117a3aab3f746c62447d3d45e84b21f90c0f365 SHA1 41733ecbd709ae56c78d28d4ca25f22e4a000604 SHA256 dacc61c8d6eddc30b12bbe3ca8b759723925857299560afb3da37ef67b4e7919
 DIST mmc-web-msc-1.2.4-635.tar.gz 318319 RMD160 3f14e3f064b6e02b512a058e5866ccadc9c4d411 SHA1 05174c53f5c872e52c52e73b5e766451e2662ca3 SHA256 499d91c8c6d1cc7bd25e28867b6b0aac796245d5f09ee937dca9361812e968df
-EBUILD mmc-web-msc-1.2.0-r1.ebuild 682 RMD160 e87e407e14802c0781f9c30c556d6dfa49200498 SHA1 396520833f0e864b6414d75720cd1d056d363a46 SHA256 b448328864788f1c4970f725387a5cd4acf2d64f23aefd0147e4eafb4d42f418
-EBUILD mmc-web-msc-1.2.0.ebuild 676 RMD160 533a6d8b45a0f23102dd788af86445c7267f3fa5 SHA1 54b706045d1d3e2ea0423a92e21137296c590096 SHA256 79b076e9647f0ae1de97f389aa2aa08494de003faec08b2508cc6ec3e9054129
-EBUILD mmc-web-msc-1.2.1_p583.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-EBUILD mmc-web-msc-1.2.2_p595.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-EBUILD mmc-web-msc-1.2.3_p607.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-EBUILD mmc-web-msc-1.2.4_p635.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-MISC ChangeLog 1439 RMD160 817f47797e155914d1473875b993ce8e3e4e4e33 SHA1 7cb90013890c52640d70b9cac55a278917b0148a SHA256 837e616e0940630a70fc1bab7c6b783b96a1abd0825739e21e3c0286889d0b6d
+EBUILD mmc-web-msc-1.2.4_p635-r1.ebuild 780 RMD160 71eef61e35128f178d311517b673587e8b16ffe9 SHA1 aef28ff4473b21b94bfa462a43b4dfeb59797c6e SHA256 bed8a0e32c1d4393a6ffabe2207da1337290a858e10f582d31ca41df8ee1b5f3
+MISC ChangeLog 1771 RMD160 82a4bfc796ca7645e4dbe56d367f8bc3fad2322d SHA1 017e2422b26d2fd48eb6b78dbe90e0c379f33bee SHA256 2eb4602517910ad6a9277b88ac81708130a73ee1f58364705e4f9f1e2c12cbc7
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/app-admin/mmc-web-msc/mmc-web-msc-1.2.0-r1.ebuild b/app-admin/mmc-web-msc/mmc-web-msc-1.2.0-r1.ebuild
deleted file mode 100644
index 5c0a2d5..0000000
--- a/app-admin/mmc-web-msc/mmc-web-msc-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-msc/mmc-web-msc-1.2.0.ebuild b/app-admin/mmc-web-msc/mmc-web-msc-1.2.0.ebuild
deleted file mode 100644
index 4c8896d..0000000
--- a/app-admin/mmc-web-msc/mmc-web-msc-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-msc/mmc-web-msc-1.2.1_p583.ebuild b/app-admin/mmc-web-msc/mmc-web-msc-1.2.1_p583.ebuild
deleted file mode 100644
index 8290d84..0000000
--- a/app-admin/mmc-web-msc/mmc-web-msc-1.2.1_p583.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-msc/mmc-web-msc-1.2.2_p595.ebuild b/app-admin/mmc-web-msc/mmc-web-msc-1.2.2_p595.ebuild
deleted file mode 100644
index 8290d84..0000000
--- a/app-admin/mmc-web-msc/mmc-web-msc-1.2.2_p595.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-msc/mmc-web-msc-1.2.3_p607.ebuild b/app-admin/mmc-web-msc/mmc-web-msc-1.2.3_p607.ebuild
deleted file mode 100644
index 8290d84..0000000
--- a/app-admin/mmc-web-msc/mmc-web-msc-1.2.3_p607.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-msc/mmc-web-msc-1.2.4_p635.ebuild b/app-admin/mmc-web-msc/mmc-web-msc-1.2.4_p635-r1.ebuild
similarity index 87%
rename from app-admin/mmc-web-msc/mmc-web-msc-1.2.4_p635.ebuild
rename to app-admin/mmc-web-msc/mmc-web-msc-1.2.4_p635-r1.ebuild
index 8290d84..d3ca3a5 100644
--- a/app-admin/mmc-web-msc/mmc-web-msc-1.2.4_p635.ebuild
+++ b/app-admin/mmc-web-msc/mmc-web-msc-1.2.4_p635-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"