diff --git a/dev-python/genshi/ChangeLog b/dev-python/genshi/ChangeLog
index db84cd83..6db52472 100644
--- a/dev-python/genshi/ChangeLog
+++ b/dev-python/genshi/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/ChangeLog,v 1.20 2009/10/25 15:59:31 arfrever Exp $
 
+  27 Jul 2010; Mario Fetka <mario.fetka@gmail.com> +genshi-0.6.ebuild:
+  Bump
+
   26 Feb 2010; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
   add arm keyword
 
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index 097c8040..06b7b85d 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,4 +1,6 @@
 AUX genshi-0.5.1_test_fix.patch 518 RMD160 5251d00a472620a3ed092a9cda543f9bedd23fcb SHA1 7e58aa391e58a511a41444a1c3959e442556c4bd SHA256 13723a9d30cc0dcd892b35a1a11df10eb7e4209425afe2e5148c1ea0d59c3a05
+DIST Genshi-0.6.tar.gz 433946 RMD160 bca068da7956f03358d2f46cb4616e06506b8ae9 SHA1 8b4d5d43dc614bc83de49c5be1c3b8a3908a8062 SHA256 32aaf76a03f88efa04143bf80700399e6d84eead818fdd19d763fd76af972a4b
+EBUILD genshi-0.6.ebuild 970 RMD160 76d8877da195a5648e0bd134a81a592f2225bd63 SHA1 7253cc45ff4ef133fbf00e68f5a83858d8f82111 SHA256 4fa21f90c4bcd55a57a81b4b6b49236210c0372533b027077467c37cf4dfd192
 EBUILD genshi-0.6_pre1.ebuild 1086 RMD160 2d1eff347ebdb4d922cfbfafd2037db33a2d18b4 SHA1 72d40ef751ce9be4daa46e870e24569068f284c9 SHA256 63755c794cbd96cee64f949dac54195fe2f7f7178d42c1eba955629a384b9f59
-MISC ChangeLog 3627 RMD160 b7d01460d13987c85a2025c0f8abe73b34f1fc3b SHA1 cf1f384c5ffb3cbbabe541e36a13062794214ab5 SHA256 66d436c16fda508e53dd7846c439e1112e332782d9e98e806884623766a7b4da
+MISC ChangeLog 3706 RMD160 51d9520b9e953d654ab80d66f9b1c14df4f5b7f2 SHA1 c4d7b7573a3bf94fdb97ec73284ae37da65ed47a SHA256 c8ff9d3efb46cabeaee222e705fcb403c74c395da41d29a61da093a19ca691a4
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/genshi/genshi-0.6.ebuild b/dev-python/genshi/genshi-0.6.ebuild
new file mode 100644
index 00000000..c444edf2
--- /dev/null
+++ b/dev-python/genshi/genshi-0.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/genshi-0.6.ebuild,v 1.5 2010/06/11 18:42:32 phajdan.jr Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit eutils distutils
+
+MY_P="Genshi-${PV}"
+
+DESCRIPTION="Python toolkit for stream-based generation of output for the web."
+HOMEPAGE="http://genshi.edgewall.org/ http://pypi.python.org/pypi/Genshi"
+SRC_URI="ftp://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools"
+RDEPEND="${DEPEND}"
+RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dodoc doc/*.txt
+		dohtml -r doc/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}