diff --git a/www-apps/trac-accountmanagerplugin/ChangeLog b/www-apps/trac-accountmanagerplugin/ChangeLog
new file mode 100644
index 00000000..ed2d08cb
--- /dev/null
+++ b/www-apps/trac-accountmanagerplugin/ChangeLog
@@ -0,0 +1,73 @@
+# ChangeLog for www-apps/trac-acct_mgr
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  31 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
+  +trac-accountmanagerplugin-0.2.1-r3.ebuild, +metadata.xml:
+  move to proper upstream naming
+
+  31 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
+  -trac-acct_mgr-0.1.3.ebuild, -trac-acct_mgr-0.2.1.ebuild,
+  -trac-acct_mgr-0.2.1-r1.ebuild, -trac-acct_mgr-0.2.1-r2.ebuild,
+  +trac-acct_mgr-0.2.1-r3.ebuild:
+  cleanup
+
+  26 Feb 2010; Mario Fetka <mario.fetka@gmail.com>
+  trac-acct_mgr-0.1.3.ebuild, trac-acct_mgr-0.2.1.ebuild,
+  trac-acct_mgr-0.2.1-r1.ebuild, trac-acct_mgr-0.2.1-r2.ebuild:
+  add arm keyword
+
+  26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  trac-acct_mgr-0.2.1-r2.ebuild:
+  remove patch
+
+  26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  trac-acct_mgr-0.2.1-r2.ebuild:
+  add korrekt deep
+
+  26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  trac-acct_mgr-0.2.1-r2.ebuild:
+  remove reistration patch
+
+  26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +trac-acct_mgr-0.2.1-r2.ebuild,
+  +files/replaceMessageWrapper-with-genshi-markup-against-0.11-branch.patch:
+  add 0.12 branch
+
+  26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  trac-acct_mgr-0.2.1-r1.ebuild:
+  add registration patch back
+
+  23 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  trac-acct_mgr-0.2.1-r1.ebuild, +files/redirect-fix.patch:
+  add redirect fix
+
+  23 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +trac-acct_mgr-0.2.1-r1.ebuild:
+  remove accountmanager patch
+
+  15 Mar 2009; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
+  add RegistrationConfirmationPatch
+
+  18 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
+  trac-acct_mgr-0.2.1.ebuild:
+  remove IRegistrationConfirmation patch
+
+  18 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
+  +files/RegistrationConfirmationPatch.diff:
+  add IRegistrationConfirmation patch
+
+  23 Nov 2008; Mario Fetka <mario.fetka@gmail.com>
+  trac-acct_mgr-0.2.1.ebuild:
+  correct trac dependency
+
+  23 Jul 2008; Mario Fetka <mario-fetka@gmx.at> trac-acct_mgr-0.2.1.ebuild:
+  correct typo
+
+  23 Jul 2008; Mario Fetka <mario-fetka@gmx.at> +metadata.xml,
+  +trac-acct_mgr-0.2.1.ebuild:
+  Bump to 0.11
+
+  18 Aug 2007; Mario Fetka <mario-fetka@gmx.at> ChangeLog:
+  Initial ebuild for Trac AccountManager
+
diff --git a/www-apps/trac-accountmanagerplugin/Manifest b/www-apps/trac-accountmanagerplugin/Manifest
new file mode 100644
index 00000000..e54a5a4a
--- /dev/null
+++ b/www-apps/trac-accountmanagerplugin/Manifest
@@ -0,0 +1,3 @@
+EBUILD trac-accountmanagerplugin-0.2.1-r3.ebuild 1141 RMD160 d9e2bb3ff4d6046089fd17a3b9c4f8c938284400 SHA1 edafb1e024379a84a06026629c3834418ffcd427 SHA256 9773e5ebce7ff69a7da2fe73f1343b9a6c30a2ea2af730e40038afd0b149eb36
+MISC ChangeLog 2310 RMD160 64efa310531551eab98dd54ec97068027b6517d7 SHA1 c20633d7a04e2e90bb0735a8fc734a58b0bf878f SHA256 a17b445ffc6899a61b32577e01773d06f04b5a9ed2ab6f76121122646feec347
+MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/www-apps/trac-accountmanagerplugin/metadata.xml b/www-apps/trac-accountmanagerplugin/metadata.xml
new file mode 100644
index 00000000..46a44e57
--- /dev/null
+++ b/www-apps/trac-accountmanagerplugin/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!-- 
+$Header: /var/cvsroot/gentoo-x86/skel.metadata.xml,v 1.18 2008/07/28 19:27:05 cardoe Exp $
+
+This is the example metadata file.
+The root element of this file is <pkgmetadata>. Within this element a 
+number of subelements are allowed: herd, maintainer, and 
+longdescription. herd is a required subelement.
+
+For a full description look at:
+http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
+
+
+Before committing, please remove the comments from this file. They are 
+not relevant for general metadata.xml files.
+-->
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>@gentoo.org</email>
+<!--  <description>Description of the maintainership</description> -->
+</maintainer>
+<!-- <longdescription>Long description of the package</longdescription> -->
+<!--
+<use>
+  <flag name='flag'>Description of how USE='flag' affects this package</flag>
+  <flag name='userland_GNU'>Description of how USERLAND='GNU' affects this
+	  package</flag>
+  <flag name='aspell'>Uses <pkg>app-text/aspell</pkg> for spell checking.
+	  Requires an installed dictionary from <cat>app-dicts</cat></flag>
+</use>
+-->
+</pkgmetadata>
diff --git a/www-apps/trac-accountmanagerplugin/trac-accountmanagerplugin-0.2.1-r3.ebuild b/www-apps/trac-accountmanagerplugin/trac-accountmanagerplugin-0.2.1-r3.ebuild
new file mode 100644
index 00000000..3edd8da4
--- /dev/null
+++ b/www-apps/trac-accountmanagerplugin/trac-accountmanagerplugin-0.2.1-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 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 $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils subversion
+
+ESVN_REPO_URI="http://trac-hacks.org/svn/accountmanagerplugin/trunk"
+DESCRIPTION="The AccountManagerPlugin offers several features for managing user accounts."
+HOMEPAGE="http://trac-hacks.org/wiki/AccountManagerPlugin"
+
+LICENSE="trac"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+SLOT="0"
+
+DEPEND="dev-python/setuptools"
+RDEPEND=">=www-apps/trac-0.12"
+
+pkg_postinst() {
+	elog "To enable the AccountManager plugin in your Trac environments, you have to add:"
+	elog "	[components]"
+	elog "	trac.web.auth.LoginModule = disabled"
+	elog "	acct_mgr.web_ui.LoginModule = enabled"
+	elog "	acct_mgr.web_ui.RegistrationModule = disabled"
+	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."
+}