diff --git a/app-admin/equo/Manifest b/app-admin/equo/Manifest
index 10e27326b..ad95f7fd4 100644
--- a/app-admin/equo/Manifest
+++ b/app-admin/equo/Manifest
@@ -11,5 +11,6 @@ EBUILD equo-0.12.23.ebuild 1360 RMD160 89b3aa44a59a7285df0316049e808bd5153b1af2
 EBUILD equo-0.12.24.1.ebuild 1360 RMD160 89b3aa44a59a7285df0316049e808bd5153b1af2 SHA1 3ce0e3d509b79eca21a7c339f5e32720a81aecc0 SHA256 77509fc118a5faa0e90614cbd885b84313564d78aec0795a8cab2891af46c063
 EBUILD equo-0.12.24.2.ebuild 1360 RMD160 89b3aa44a59a7285df0316049e808bd5153b1af2 SHA1 3ce0e3d509b79eca21a7c339f5e32720a81aecc0 SHA256 77509fc118a5faa0e90614cbd885b84313564d78aec0795a8cab2891af46c063
 EBUILD equo-0.12.24.3.ebuild 1360 RMD160 89b3aa44a59a7285df0316049e808bd5153b1af2 SHA1 3ce0e3d509b79eca21a7c339f5e32720a81aecc0 SHA256 77509fc118a5faa0e90614cbd885b84313564d78aec0795a8cab2891af46c063
+EBUILD equo-0.12.24.4.ebuild 1360 RMD160 89b3aa44a59a7285df0316049e808bd5153b1af2 SHA1 3ce0e3d509b79eca21a7c339f5e32720a81aecc0 SHA256 77509fc118a5faa0e90614cbd885b84313564d78aec0795a8cab2891af46c063
 EBUILD equo-0.12.24.ebuild 1360 RMD160 89b3aa44a59a7285df0316049e808bd5153b1af2 SHA1 3ce0e3d509b79eca21a7c339f5e32720a81aecc0 SHA256 77509fc118a5faa0e90614cbd885b84313564d78aec0795a8cab2891af46c063
 EBUILD equo-9999-r8.ebuild 1340 RMD160 574057dde5dc0c5ae3cc5f19895b548c51c31585 SHA1 8db0da11249ce5671f0499207d62a821b1e0d170 SHA256 e83dfc31ab1d7d43ff24b4a29c384eed3bb8dd951da07dc3a7b8e9f6f1df6c73
diff --git a/app-admin/equo/equo-0.12.24.4.ebuild b/app-admin/equo/equo-0.12.24.4.ebuild
new file mode 100644
index 000000000..0bb1cb63c
--- /dev/null
+++ b/app-admin/equo/equo-0.12.24.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2004-2007 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils subversion
+ESVN_REPO_URI="http://svn.sabayonlinux.org/projects/entropy/tags/${PV}"
+
+DESCRIPTION="Official Sabayon Linux Package Manager Client (tagged release)"
+HOMEPAGE="http://www.sabayonlinux.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"/trunk
+
+DEPEND="~sys-apps/entropy-${PV}"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+
+	##########
+	#
+	# Equo
+	#
+	#########
+
+	dodir /usr/$(get_libdir)/entropy/client
+	dodir /etc/portage
+
+	# copying portage bashrc
+	insinto /etc/portage
+	mv ${S}/conf/etc-portage-bashrc ${S}/conf/bashrc
+	doins ${S}/conf/bashrc
+
+        # copy configuration
+        cd ${S}/conf
+        dodir /etc/entropy
+        insinto /etc/entropy
+        doins equo.conf
+        doins repositories.conf
+	
+	# copy client
+	cd ${S}/client
+	insinto /usr/$(get_libdir)/entropy/client
+	doins *.py
+	doins equo
+
+	cd ${S}
+	dodir /usr/bin
+	echo '#!/bin/sh' > equo
+	echo 'if [ -f "/etc/profile" ]; then source /etc/profile; fi' >> equo
+	echo 'cd /usr/'$(get_libdir)'/entropy/client' >> equo
+	echo 'LD_LIBRARY_PATH="/usr/'$(get_libdir)'/entropy/client/lib/:/usr/'$(get_libdir)'/entropy/client/libraries/pysqlite2/" python equo "$@"' >> equo
+	exeinto /usr/bin
+	doexe equo
+
+}
diff --git a/app-admin/spritz/Manifest b/app-admin/spritz/Manifest
index 2c00c054d..0788e5f91 100644
--- a/app-admin/spritz/Manifest
+++ b/app-admin/spritz/Manifest
@@ -10,5 +10,6 @@ EBUILD spritz-0.12.23.ebuild 1020 RMD160 bdc51d8ae956d75197a251e62382df16369b72b
 EBUILD spritz-0.12.24.1.ebuild 1085 RMD160 527824053ad4ceca71a42a7809609244efed59da SHA1 bf3230c4de79b6f65a9e29b0b32b7d01bfb31abb SHA256 c86a85b03558ea3ea3b675f795a9d20650d4efbb6713f76110863b4815dd0280
 EBUILD spritz-0.12.24.2.ebuild 1085 RMD160 527824053ad4ceca71a42a7809609244efed59da SHA1 bf3230c4de79b6f65a9e29b0b32b7d01bfb31abb SHA256 c86a85b03558ea3ea3b675f795a9d20650d4efbb6713f76110863b4815dd0280
 EBUILD spritz-0.12.24.3.ebuild 1085 RMD160 527824053ad4ceca71a42a7809609244efed59da SHA1 bf3230c4de79b6f65a9e29b0b32b7d01bfb31abb SHA256 c86a85b03558ea3ea3b675f795a9d20650d4efbb6713f76110863b4815dd0280
+EBUILD spritz-0.12.24.4.ebuild 1085 RMD160 527824053ad4ceca71a42a7809609244efed59da SHA1 bf3230c4de79b6f65a9e29b0b32b7d01bfb31abb SHA256 c86a85b03558ea3ea3b675f795a9d20650d4efbb6713f76110863b4815dd0280
 EBUILD spritz-0.12.24.ebuild 1085 RMD160 527824053ad4ceca71a42a7809609244efed59da SHA1 bf3230c4de79b6f65a9e29b0b32b7d01bfb31abb SHA256 c86a85b03558ea3ea3b675f795a9d20650d4efbb6713f76110863b4815dd0280
 EBUILD spritz-9999-r1.ebuild 1000 RMD160 d698f35ccea733d3a1669827a2a53bf5a5014cf7 SHA1 48e1a7f4cdee89830a2a068335cc4fd07d749f0a SHA256 fac0e92c5df14ae9a098963293b7272560cf9136745897671450d83c0e0fdfc6
diff --git a/app-admin/spritz/spritz-0.12.24.4.ebuild b/app-admin/spritz/spritz-0.12.24.4.ebuild
new file mode 100644
index 000000000..c016bd30d
--- /dev/null
+++ b/app-admin/spritz/spritz-0.12.24.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2004-2007 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils subversion multilib
+ESVN_REPO_URI="http://svn.sabayonlinux.org/projects/entropy/tags/${PV}/spritz"
+DESCRIPTION="Official Sabayon Linux Package Manager Graphical Client (tagged release)"
+HOMEPAGE="http://www.sabayonlinux.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"/trunk
+
+RDEPEND="
+	~sys-apps/entropy-${PV}
+	>=dev-python/pygtk-2.10
+	>=x11-libs/vte-0.12.2
+	x11-misc/xdg-utils
+	dev-python/notify-python
+	>=dev-python/gnome-python-extras-2.19
+	"
+DEPEND="sys-devel/gettext"
+
+pkg_setup ()
+{
+        if ! built_with_use x11-libs/vte python; then
+                echo
+                eerror "x11-libs/vte has not been built with python support."
+                eerror "Please re-emerge vte with the python use-flag enabled."
+                die "missing python flag for x11-libs/vte"
+        fi
+}
+
+src_unpack() {
+	# prepare spritz stuff
+	subversion_src_unpack
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
diff --git a/sys-apps/entropy-server/Manifest b/sys-apps/entropy-server/Manifest
index 8e119d95b..8e04a3231 100644
--- a/sys-apps/entropy-server/Manifest
+++ b/sys-apps/entropy-server/Manifest
@@ -5,4 +5,5 @@ EBUILD entropy-server-0.12.23.7.ebuild 1134 RMD160 02a37b6fd9484d71aef2211a1af20
 EBUILD entropy-server-0.12.24.1.ebuild 1134 RMD160 02a37b6fd9484d71aef2211a1af20637a284edcf SHA1 1348f37b9a3878f01c816cfec65c9d5cea94872c SHA256 38be7e835ddc3a059f769feebc928741f9064e77330bdde9e68ada01432a6d60
 EBUILD entropy-server-0.12.24.2.ebuild 1134 RMD160 02a37b6fd9484d71aef2211a1af20637a284edcf SHA1 1348f37b9a3878f01c816cfec65c9d5cea94872c SHA256 38be7e835ddc3a059f769feebc928741f9064e77330bdde9e68ada01432a6d60
 EBUILD entropy-server-0.12.24.3.ebuild 1134 RMD160 02a37b6fd9484d71aef2211a1af20637a284edcf SHA1 1348f37b9a3878f01c816cfec65c9d5cea94872c SHA256 38be7e835ddc3a059f769feebc928741f9064e77330bdde9e68ada01432a6d60
+EBUILD entropy-server-0.12.24.4.ebuild 1134 RMD160 02a37b6fd9484d71aef2211a1af20637a284edcf SHA1 1348f37b9a3878f01c816cfec65c9d5cea94872c SHA256 38be7e835ddc3a059f769feebc928741f9064e77330bdde9e68ada01432a6d60
 EBUILD entropy-server-0.12.24.ebuild 1134 RMD160 02a37b6fd9484d71aef2211a1af20637a284edcf SHA1 1348f37b9a3878f01c816cfec65c9d5cea94872c SHA256 38be7e835ddc3a059f769feebc928741f9064e77330bdde9e68ada01432a6d60
diff --git a/sys-apps/entropy-server/entropy-server-0.12.24.4.ebuild b/sys-apps/entropy-server/entropy-server-0.12.24.4.ebuild
new file mode 100644
index 000000000..dd18bb829
--- /dev/null
+++ b/sys-apps/entropy-server/entropy-server-0.12.24.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2004-2007 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils subversion
+ESVN_REPO_URI="http://svn.sabayonlinux.org/projects/entropy/tags/${PV}"
+
+DESCRIPTION="Official Sabayon Linux Package Manager Server Interface (tagged release)"
+HOMEPAGE="http://www.sabayonlinux.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"/trunk
+
+DEPEND="~sys-apps/entropy-${PV}"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+
+	dodir /usr/$(get_libdir)/entropy/server
+
+        # copy configuration
+        cd ${S}/conf
+        dodir /etc/entropy
+        insinto /etc/entropy
+        doins activator.conf
+        doins reagent.conf
+        doins remote.conf
+        doins server.conf
+	
+	# copy server
+	cd ${S}/server
+	insinto /usr/$(get_libdir)/entropy/server
+	doins -r ./*
+
+	cd ${S}
+	packages="reagent activator"
+	for package in ${packages}; do
+		echo '#!/bin/sh' > ${package}
+		echo 'cd /usr/'$(get_libdir)'/entropy/server' >> ${package}
+		echo 'python '${package}' "$@"' >> ${package}
+		exeinto /usr/sbin
+		doexe ${package}
+	done
+
+}
diff --git a/sys-apps/entropy/Manifest b/sys-apps/entropy/Manifest
index 326702952..ec407b92f 100644
--- a/sys-apps/entropy/Manifest
+++ b/sys-apps/entropy/Manifest
@@ -12,5 +12,6 @@ EBUILD entropy-0.12.23.ebuild 2740 RMD160 07e486c089055567f93d27b2c1e76717953072
 EBUILD entropy-0.12.24.1.ebuild 2740 RMD160 07e486c089055567f93d27b2c1e7671795307267 SHA1 d3d016ddc79810190a5ecde582e5eacc535383b7 SHA256 8fc3bbc007db4bebce139a6647b0b7c6162cc12d57a7477f9f297f6c925ac091
 EBUILD entropy-0.12.24.2.ebuild 2740 RMD160 07e486c089055567f93d27b2c1e7671795307267 SHA1 d3d016ddc79810190a5ecde582e5eacc535383b7 SHA256 8fc3bbc007db4bebce139a6647b0b7c6162cc12d57a7477f9f297f6c925ac091
 EBUILD entropy-0.12.24.3.ebuild 2740 RMD160 07e486c089055567f93d27b2c1e7671795307267 SHA1 d3d016ddc79810190a5ecde582e5eacc535383b7 SHA256 8fc3bbc007db4bebce139a6647b0b7c6162cc12d57a7477f9f297f6c925ac091
+EBUILD entropy-0.12.24.4.ebuild 2740 RMD160 07e486c089055567f93d27b2c1e7671795307267 SHA1 d3d016ddc79810190a5ecde582e5eacc535383b7 SHA256 8fc3bbc007db4bebce139a6647b0b7c6162cc12d57a7477f9f297f6c925ac091
 EBUILD entropy-0.12.24.ebuild 2740 RMD160 07e486c089055567f93d27b2c1e7671795307267 SHA1 d3d016ddc79810190a5ecde582e5eacc535383b7 SHA256 8fc3bbc007db4bebce139a6647b0b7c6162cc12d57a7477f9f297f6c925ac091
 EBUILD entropy-9999.ebuild 2727 RMD160 099a33e9d3685958eae98ac9ccfc464969036fd5 SHA1 9bc68185d45d472cf86eb79fc76c63862fecc406 SHA256 b22faeaa81c8522bc2054cdefbf5049d90735911208ac0ba7a376781acd8a4b6
diff --git a/sys-apps/entropy/entropy-0.12.24.4.ebuild b/sys-apps/entropy/entropy-0.12.24.4.ebuild
new file mode 100644
index 000000000..76b4091be
--- /dev/null
+++ b/sys-apps/entropy/entropy-0.12.24.4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2004-2007 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+NEED_PYTHON=2.4
+
+inherit eutils subversion distutils python multilib
+ESVN_REPO_URI="http://svn.sabayonlinux.org/projects/entropy/tags/${PV}"
+
+DESCRIPTION="Official Sabayon Linux Package Manager library"
+HOMEPAGE="http://www.sabayonlinux.org"
+PYTHON_MODNAME="pysqlite2"
+PYSQLITE_VER="2.3.5"
+PYSQLITE_DIRNAME="pysqlite"
+SRC_URI="http://initd.org/pub/software/pysqlite/releases/${PYSQLITE_VER:0:3}/${PYSQLITE_VER}/pysqlite-${PYSQLITE_VER}.tar.gz"
+
+LICENSE="GPL-2 pysqlite"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"/trunk
+
+DEPEND="
+	dev-db/sqlite:3
+	sys-apps/diffutils"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+
+	# prepare entropy stuff
+	subversion_src_unpack
+
+	# prepare sqlite stuff
+	cd ${WORKDIR}
+	distutils_src_unpack
+	cd ${WORKDIR}/${PYSQLITE_DIRNAME}-${PYSQLITE_VER}
+	sed -i -e 's/, "pysqlite2.test"//' \
+		setup.py || die "sed in setup.py failed"
+	# workaround to make checks work without installing them
+	sed -i -e "s/pysqlite2.test/test/" \
+		pysqlite2/test/__init__.py || die "sed failed"
+	# correct encoding
+	sed -i -e "s/\(coding: \)ISO-8859-1/\1utf-8/" \
+		pysqlite2/__init__.py pysqlite2/dbapi2.py || die "sed failed"
+
+	# setting svn revision
+	#cd ${ESVN_STORE_DIR}/${PN}/trunk
+	#SVNREV=$(svnversion)
+	echo "${PV}" > ${S}/libraries/revision
+}
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+
+	##########
+	#
+	# Entropy
+	#
+	#########
+
+	dodir /usr/$(get_libdir)/entropy/libraries
+	
+	# copying libraries
+	cd ${S}/libraries
+	insinto /usr/$(get_libdir)/entropy/libraries
+	doins *.py
+	doins revision
+
+	# copy configuration
+	cd ${S}/conf
+	dodir /etc/entropy
+	insinto /etc/entropy
+	doins -r *
+	rm ${D}/etc/entropy/equo.conf
+	rm ${D}/etc/entropy/repositories.conf
+	rm ${D}/etc/entropy/reagent.conf
+	rm ${D}/etc/entropy/activator.conf
+	rm ${D}/etc/entropy/remote.conf
+	rm ${D}/etc/entropy/server.conf
+
+	#########
+	#
+	# PySQLite
+	#
+	#########
+
+	cd ${WORKDIR}/${PYSQLITE_DIRNAME}-${PYSQLITE_VER}
+	distutils_src_install
+	rm -rf "${D}"/usr/pysqlite2-doc
+	rm -rf "${D}"/usr/share/doc
+
+	########
+	#
+	# Python
+	#
+	########
+	
+	python_version
+	mkdir "${D}"/usr/$(get_libdir)/entropy/libraries/pysqlite2
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/${PYTHON_MODNAME}/* "${D}"/usr/$(get_libdir)/entropy/libraries/pysqlite2/ || die "cannot move pysqlite library"
+	rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}
+	if use amd64; then
+		cp ${S}/libraries/python/amd64/libpython* "${D}"/usr/$(get_libdir)/entropy/libraries/pysqlite2/
+	else
+		cp ${S}/libraries/python/x86/libpython* "${D}"/usr/$(get_libdir)/entropy/libraries/pysqlite2/
+	fi
+	chmod 555 "${D}"/usr/$(get_libdir)/entropy/libraries/pysqlite2/libpython*
+}