diff --git a/app-admin/equo/Manifest b/app-admin/equo/Manifest
index efaa9cfd9..4efc27e30 100644
--- a/app-admin/equo/Manifest
+++ b/app-admin/equo/Manifest
@@ -7,6 +7,10 @@ EBUILD equo-0.8.35.ebuild 3126 RMD160 0609c272b8c87411181e0c1cf8287bfee9a8d2e7 S
 MD5 ed0c26242e869e5ef58f024a3c7a2a7c equo-0.8.35.ebuild 3126
 RMD160 0609c272b8c87411181e0c1cf8287bfee9a8d2e7 equo-0.8.35.ebuild 3126
 SHA256 bca8c33700c61cb36e8069b3696955374382def152a51ded3dbb0f805d74a433 equo-0.8.35.ebuild 3126
+EBUILD equo-0.8.36.ebuild 3126 RMD160 0609c272b8c87411181e0c1cf8287bfee9a8d2e7 SHA1 b2228791921c95b087a2e65c0399cc05513e13fa SHA256 bca8c33700c61cb36e8069b3696955374382def152a51ded3dbb0f805d74a433
+MD5 ed0c26242e869e5ef58f024a3c7a2a7c equo-0.8.36.ebuild 3126
+RMD160 0609c272b8c87411181e0c1cf8287bfee9a8d2e7 equo-0.8.36.ebuild 3126
+SHA256 bca8c33700c61cb36e8069b3696955374382def152a51ded3dbb0f805d74a433 equo-0.8.36.ebuild 3126
 EBUILD equo-9999-r7.ebuild 2998 RMD160 ffa496c04c7b896b2dd18d25176d4c8583d2f6e0 SHA1 b043e6598e99565813a3b3a5257b55f817a673af SHA256 defc3ab18cc17367362d95ba8627cdf0550dc51ae237f81cb8d5a60d0da8d919
 MD5 fcbe7f6a25936d279a9964d524e3e03f equo-9999-r7.ebuild 2998
 RMD160 ffa496c04c7b896b2dd18d25176d4c8583d2f6e0 equo-9999-r7.ebuild 2998
@@ -17,6 +21,9 @@ SHA256 14952b25206d49f0512824bdf34f61a81aa74890bb1e325ebbe844edb286a676 files/di
 MD5 b72cdd1d27edb4d775d3598add69f199 files/digest-equo-0.8.35 241
 RMD160 13c2568a512e956c0aa0a91650b7993e796d9366 files/digest-equo-0.8.35 241
 SHA256 14952b25206d49f0512824bdf34f61a81aa74890bb1e325ebbe844edb286a676 files/digest-equo-0.8.35 241
+MD5 b72cdd1d27edb4d775d3598add69f199 files/digest-equo-0.8.36 241
+RMD160 13c2568a512e956c0aa0a91650b7993e796d9366 files/digest-equo-0.8.36 241
+SHA256 14952b25206d49f0512824bdf34f61a81aa74890bb1e325ebbe844edb286a676 files/digest-equo-0.8.36 241
 MD5 b72cdd1d27edb4d775d3598add69f199 files/digest-equo-9999-r7 241
 RMD160 13c2568a512e956c0aa0a91650b7993e796d9366 files/digest-equo-9999-r7 241
 SHA256 14952b25206d49f0512824bdf34f61a81aa74890bb1e325ebbe844edb286a676 files/digest-equo-9999-r7 241
diff --git a/app-admin/equo/equo-0.8.36.ebuild b/app-admin/equo/equo-0.8.36.ebuild
new file mode 100644
index 000000000..78d2574b8
--- /dev/null
+++ b/app-admin/equo/equo-0.8.36.ebuild
@@ -0,0 +1,121 @@
+# 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 Client (SVN release)"
+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.1
+	!sys-apps/entropy"
+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
+	dodir /usr/$(get_libdir)/entropy/client
+	
+	# copying libraries
+	cd ${S}/libraries
+	insinto /usr/$(get_libdir)/entropy/libraries
+	doins *.py
+	doins revision
+
+	# copy client
+	cd ${S}/client
+	insinto /usr/$(get_libdir)/entropy/client
+	doins *.py
+	exeinto /usr/$(get_libdir)/entropy/client
+	doexe 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
+
+	# copy configuration
+	cd ${S}/conf
+	dodir /etc/entropy
+	insinto /etc/entropy
+	doins -r *
+	rm -f ${D}/etc/entropy/activator.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*
+}
diff --git a/app-admin/equo/files/digest-equo-0.8.36 b/app-admin/equo/files/digest-equo-0.8.36
new file mode 100644
index 000000000..1593730f6
--- /dev/null
+++ b/app-admin/equo/files/digest-equo-0.8.36
@@ -0,0 +1,3 @@
+MD5 b4a185e936848370fcc1a5b17755b641 pysqlite-2.3.5.tar.gz 85198
+RMD160 ee9064b73f0ffc90bdf586b4534bd8c48bf4b440 pysqlite-2.3.5.tar.gz 85198
+SHA256 074e88e14762cf25684658fbc893eb9f55cf4b9889b71f8aeee6e8992d3f33fe pysqlite-2.3.5.tar.gz 85198