diff --git a/www-apps/trac-accountmanagerplugin/ChangeLog b/www-apps/trac-accountmanagerplugin/ChangeLog
index 0b902b82..f1dc841e 100644
--- a/www-apps/trac-accountmanagerplugin/ChangeLog
+++ b/www-apps/trac-accountmanagerplugin/ChangeLog
@@ -1,7 +1,14 @@
-# ChangeLog for www-apps/trac-acct_mgr
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# ChangeLog for www-apps/trac-accountmanagerplugin
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trac-accountmanagerplugin-0.4 (19 Nov 2011)
+
+  19 Nov 2011; Mario Fetka <mario.fetka@gmail.com>
+  -trac-accountmanagerplugin-0.3.ebuild, +trac-accountmanagerplugin-0.4.ebuild,
+  metadata.xml:
+  Bump
+
   21 Oct 2010; Mario Fetka <mario.fetka@gmail.com>
   -trac-accountmanagerplugin-0.2.1-r3.ebuild,
   +trac-accountmanagerplugin-0.3.ebuild:
diff --git a/www-apps/trac-accountmanagerplugin/Manifest b/www-apps/trac-accountmanagerplugin/Manifest
index cbe3f4b6..45c354e9 100644
--- a/www-apps/trac-accountmanagerplugin/Manifest
+++ b/www-apps/trac-accountmanagerplugin/Manifest
@@ -1,3 +1,3 @@
-EBUILD trac-accountmanagerplugin-0.3.ebuild 1165 RMD160 d86ca61ceafb3baf82cddb7b669e1749fe7ee75d SHA1 bb1bdcae198144a2cf20e867bd556587cddc7c9c SHA256 32f118788319c35ee6bed0fc2661d0cadec2f3fdb4e3a2a73dd660052d84609e
-MISC ChangeLog 2678 RMD160 0936e7714f8ae6cabd80fda9b09767d4b0960759 SHA1 f22abab1035daf9dd2d683694460976595f95d9f SHA256 eacddf71b39c7244be4f44bce82e91d26977d0641f0d056b458cf2f53a56fa1a
-MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
+EBUILD trac-accountmanagerplugin-0.4.ebuild 1169 RMD160 0244c116206953147449f3ccf43e4c551eb61b36 SHA1 409bb4027af8fc6a12ed12a24e4c5603bc0972fb SHA256 c163e100e181d89d8c6fb92400d920cdbc7ab3e8b05923d0f616154ca0e0541b
+MISC ChangeLog 2891 RMD160 0d7824119295c393b7b32c867e313e0535561304 SHA1 e1e06c41d7c17dd29bde0644aeddfeeae16f2070 SHA256 e13f5d0c1c94479197f55e1e6a920811cd4c08d46107acfd1491dab7edfa24e1
+MISC metadata.xml 205 RMD160 f85e91d792c694cb3e45fac26295dba0e6e43786 SHA1 3f13c3b49579342e2308323aa3dda2f43dd94c23 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc
diff --git a/www-apps/trac-accountmanagerplugin/metadata.xml b/www-apps/trac-accountmanagerplugin/metadata.xml
index 46a44e57..0830b325 100644
--- a/www-apps/trac-accountmanagerplugin/metadata.xml
+++ b/www-apps/trac-accountmanagerplugin/metadata.xml
@@ -1,34 +1,7 @@
 <?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> -->
+  <email>mario.fetka@gmail.com</email>
 </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.3.ebuild b/www-apps/trac-accountmanagerplugin/trac-accountmanagerplugin-0.4.ebuild
similarity index 94%
rename from www-apps/trac-accountmanagerplugin/trac-accountmanagerplugin-0.3.ebuild
rename to www-apps/trac-accountmanagerplugin/trac-accountmanagerplugin-0.4.ebuild
index 5ac312cd..b7156aaa 100644
--- a/www-apps/trac-accountmanagerplugin/trac-accountmanagerplugin-0.3.ebuild
+++ b/www-apps/trac-accountmanagerplugin/trac-accountmanagerplugin-0.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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"
+EAPI=3
+
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
@@ -13,7 +14,7 @@ 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"
+LICENSE="BEER-WARE"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""