diff --git a/www-apps/trac-SimpleCaptchaPlugin/Manifest b/www-apps/trac-SimpleCaptchaPlugin/Manifest
new file mode 100644
index 00000000..836e5b63
--- /dev/null
+++ b/www-apps/trac-SimpleCaptchaPlugin/Manifest
@@ -0,0 +1 @@
+EBUILD trac-SimpleCaptchaPlugin-0.1.ebuild 1312 RMD160 354c0615e93b2897746465a59329e5f41211d9a1 SHA1 c767333d422195aafb75bd64b1bc8e613924b2bc SHA256 0e946ce55857c79cf18bc20273e759983d6699149d8dc40d24bae971ecc1c820
diff --git a/www-apps/trac-SimpleCaptchaPlugin/trac-SimpleCaptchaPlugin-0.1.ebuild b/www-apps/trac-SimpleCaptchaPlugin/trac-SimpleCaptchaPlugin-0.1.ebuild
new file mode 100644
index 00000000..c0d141b8
--- /dev/null
+++ b/www-apps/trac-SimpleCaptchaPlugin/trac-SimpleCaptchaPlugin-0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild,v 1.4 2007/02/13 20:39:33 corsair Exp $
+
+inherit distutils subversion
+
+ESVN_REPO_URI="http://trac-hacks.org/svn/simplecaptchaplugin/0.11"
+DESCRIPTION="A simple CAPTCHA for new user registration using Trac's AccountManagerPlugin that uses Skimpy Gimpy."
+HOMEPAGE="http://trac-hacks.org/wiki/SimpleCaptchaPlugin"
+# SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="trac"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+SLOT="0"
+
+DEPEND="=www-apps/trac-0.11*
+	www-apps/trac-acct_mgr
+	dev-python/skimpy
+	>=dev-python/setuptools-0.6_rc1"
+
+# from marienz's setuptools.eclass:
+src_install() {
+	"${python}" setup.py install --root=${D} --no-compile \
+		--single-version-externally-managed "$@" || die "install failed"
+}
+
+src_test() {
+	"${python}" setup.py test || die "tests failed"
+}
+
+pkg_postinst() {
+	elog "To enable the SimpleCaptcha plugin in your Trac environments, you have to add:"
+	elog "	[simplecaptcha]"
+	elog "	dictionary_file = /path/to/dictionary.txt"
+	elog "to your trac.ini files."
+	elog
+	elog "To be able to see the Admin tab, your users must have the TRAC_ADMIN permission"
+	elog "and/or the TICKET_ADMIN permission."
+}
diff --git a/www-apps/trac-acct_mgr/Manifest b/www-apps/trac-acct_mgr/Manifest
index 68ba02e5..e7d09364 100644
--- a/www-apps/trac-acct_mgr/Manifest
+++ b/www-apps/trac-acct_mgr/Manifest
@@ -1,4 +1,5 @@
+AUX RegistrationConfirmationPatch.diff 4616 RMD160 db685311cf66aa0b56fef2f6609bf66b19fcc0aa SHA1 cc8994159967e559281cd35587b7813f8772d66e SHA256 ca5804ff9f94e8098b030d120286ee2a9e8ddf7c993a246e501d2ca4d37e3646
 EBUILD trac-acct_mgr-0.1.3.ebuild 1214 RMD160 08c61116b34731a9204414a8801df2ed49327e61 SHA1 366ed27ec819f45a352573b3029ad79d84ece486 SHA256 dbcaa0bbb198ee2c4bb8d354dce62faabe36c823bfda827daf16fb87ec2c9b2c
-EBUILD trac-acct_mgr-0.2.1.ebuild 1342 RMD160 9093204275ba973845d8003fdd8dd8085cf6c5d1 SHA1 2a2fce31390e3792f953a24e48cedca73a55d74b SHA256 a0791534b175b6d89c4bc99a221a740b5d3b81bc7aaf03e7496c7de422ec0f72
+EBUILD trac-acct_mgr-0.2.1.ebuild 1452 RMD160 d7a6f2c4383b7d8e20f1436d207f42f3f12ec216 SHA1 e9b155b3b1624f01fcca7900b732ae79a142e92e SHA256 db959f598775b0b3ddfc88aec6e235e27a70785dbd56e9644692410c38e6902e
 MISC ChangeLog 534 RMD160 cc0a5580bff4d55a5cb619d62c5e7b5703ceec5c SHA1 11b374a06caaa193d7ae5a520e5c7933b7722352 SHA256 f85cc9d037e0a24612a5590af9408c3c7d21954f8a999673f583d2ea93806f71
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/www-apps/trac-acct_mgr/trac-acct_mgr-0.2.1.ebuild b/www-apps/trac-acct_mgr/trac-acct_mgr-0.2.1.ebuild
index a853d485..4efe03ec 100644
--- a/www-apps/trac-acct_mgr/trac-acct_mgr-0.2.1.ebuild
+++ b/www-apps/trac-acct_mgr/trac-acct_mgr-0.2.1.ebuild
@@ -18,6 +18,13 @@ SLOT="0"
 DEPEND="=www-apps/trac-0.11*
 	>=dev-python/setuptools-0.6_rc1"
 
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}/RegistrationConfirmationPatch.diff"
+}
+
+
 # from marienz's setuptools.eclass:
 src_install() {
 	"${python}" setup.py install --root=${D} --no-compile \