diff --git a/dev-php/phpcaptcha/Manifest b/dev-php/securimage/Manifest
copy from dev-php/phpcaptcha/Manifest
copy to dev-php/securimage/Manifest
--- a/dev-php/phpcaptcha/Manifest
+++ b/dev-php/securimage/Manifest
@@ -3,22 +3,22 @@ Hash: SHA256
 
 AUX phpcaptcha-2.0.1-pic.patch 1612 RMD160 20db81c0ad3b2756f8db760091ed02c5be6c56d0 SHA1 6a6cf3c2f278bb34704d89c55ffb1133a3305c1b SHA256 f02930084ac93944db6b656118c82ba005a2477c8804f0af3916f6e570c8c27f
 DIST phpcaptcha-2.0.1.tar.gz 1225132 RMD160 1193ffa146c0c7e1fd882b6b62e3e63422c847a9 SHA1 f628ffc95638499b967251d31ab3ea8b7aa76444 SHA256 ec40eccac4833a754f67a7a83ab82cf5fcbed43d2682ae060ced87de84d20779
-EBUILD phpcaptcha-2.0.1.ebuild 813 RMD160 9e3e7aa7b6ec9ab798d932fb0c9780a7fa677a42 SHA1 743b2ab914a8aa9d8bd7e6e781ac51b9ca0099bd SHA256 20b5e9f64e17b96224ebad7b21899e2b3b1f547839478ca1a82895e9d0eab36c
+EBUILD securimage-2.0.1.ebuild 822 RMD160 57189ec05143699cf4ef8e3d7f1807ac857cc5a6 SHA1 60d0e68a0a8c0f6562b01f05ba000f09cf1551f3 SHA256 6f56d538b07220d6ffdfdd703cf3304c4ca48804aafcd70dc743987412d8ced8
 MISC metadata.xml 214 RMD160 bb0d8258795c3f73de94e0a8bc00e682d501385e SHA1 3deb0e98b60dbe29b548ad26852379fbdd07bb23 SHA256 2fff4b9c64633c18ee5ee3f2ff48f30d8310d56e414f09c0a1eacf4396dc1535
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNHlEzAAoJEHQ6UuhrqBBQufsQAI6IBkCNlPbaXsxcS7UFRjvB
-+HWSYRZEwVcsxRP9pey5jWE/nuoKY8731DCz6tsxkQV6znKL1GG9K94b+B027/7P
-Vf6fjKczNMIjD1GBn4DON1BBSaLogvMRAJq5zTn2+l2b54pbtVdd+KIbl98nQJcy
-ThIwVkbbx57tx4E4H2O67bm4GCPS6WCan+o0MRelRoTAbFYjgASlaJlR/ybT0Rfb
-moiJR19LVRHEnYZ3kqtscHd8VeFf8kLWmwsAc2PkLrgw7r+54ppF+jJYhDFtrMkR
-po2H9iWwElI0EZXpLZkmqO8gPAjXSYkozkvydbcLaRYpzn512+hMrl3OA42OrdsN
-g9pAREHgnaEM8hP7D6g6hljUveIYF4RSB+YQBVJTbFt+YwsHmTbWhfnx1oCnVLfb
-zSRNC4JAg1bQ7U8tenQlQAelrq14L5bIjPw24s2AmrUiU0UcneOz4G13ZapkZowj
-HLkynRR1JsKGDnrVScs17DA/zX6WsBNS/C+ItHaOk9Nn56m8qTz9nNB85Qp8TV25
-vj1oZYgGBPoi0HaO9QDT0gKf9rAw2MBaWJQb0djbI3aSWONs26jPJ5YHxTMI+IQp
-FkqxcZyFaOFMtlbh7zAoUyO7rPpDQgIXRuJh3noMaLvC1FG0E7W6htuIUmxRq0vY
-8ci6gqUoQ3Z5NWsUEqD7
-=E7bc
+iQIcBAEBCAAGBQJNOodoAAoJEHQ6UuhrqBBQMP4P/Ar9WfyQJxRUAnDEq3Gvj8DK
+8NRMnENLBzXhLZq6k63QSMgepPEaTLSMfT90mrTVpV6pBUsVioojM+/A2M2otLrY
+/uORXmJk6R0MVpIsolBCUrdevVzQLsyt28QbtGbgvbyjkta67sowhtCjKkiFCjAX
+B5zQtY7uUfoQGcvHqzb/WM2UKXV6nSQHofBGhdz+u886+xZxsX3R5mlhkOOFjTiB
+7EUl53rXLX0ThU1vEUuMezcgPju7sDtChwx5S358F8SaEfK6NWoOmK5q+ix9KOxg
+yVIMXHQi5fx6s5CmbVdwbNfXryAjqTDLR8Anir9M3AxyM2RTZz5coulI5FAru+Y8
+ZfI7ldzqCxGrN1x1cVnap0pd8dO1X+Ki4cYYTSxMEvflC6h7XXhUOzsfqrtAO+XJ
+zbcavo7iYHdV7M2sP9d97p40QYrQ2fQOZ1LGiKUHWUhRGMETJdiZ4UMJ5N+649Q/
+POQLpzIfr4/P+YIFs/E+x3M0IZPjLFw2/vQaC/FCnGk3x9/mrKZcZxvXuI+9SsYK
+NzhQlVxjw+SGs4ASdGlXsO/NGN+/uYXZUKsm4dNdXcTYXETfZHAw5E/MGc6I2YZL
+l9KfcptA+AHShfPHN7LMZMSLRUQ+Cy76DmrQLFN+YPZ9xrf5I51g66L5kqF0VGZy
+qUF6fk9kFRhzeGQ03v4A
+=+sYE
 -----END PGP SIGNATURE-----
diff --git a/dev-php/phpcaptcha/files/phpcaptcha-2.0.1-pic.patch b/dev-php/securimage/files/phpcaptcha-2.0.1-pic.patch
copy from dev-php/phpcaptcha/files/phpcaptcha-2.0.1-pic.patch
copy to dev-php/securimage/files/phpcaptcha-2.0.1-pic.patch
diff --git a/dev-php/phpcaptcha/metadata.xml b/dev-php/securimage/metadata.xml
copy from dev-php/phpcaptcha/metadata.xml
copy to dev-php/securimage/metadata.xml
diff --git a/dev-php/phpcaptcha/phpcaptcha-2.0.1.ebuild b/dev-php/securimage/securimage-2.0.1.ebuild
copy from dev-php/phpcaptcha/phpcaptcha-2.0.1.ebuild
copy to dev-php/securimage/securimage-2.0.1.ebuild
--- a/dev-php/phpcaptcha/phpcaptcha-2.0.1.ebuild
+++ b/dev-php/securimage/securimage-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# 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/dev-libs/apr-util/apr-util-1.3.9.ebuild,v 1.12 2009/11/04 12:12:05 arfrever Exp $
 
@@ -8,7 +8,7 @@ inherit eutils
 
 DESCRIPTION="PHP captcha creator and validator library"
 HOMEPAGE="http://phpcaptcha.org/"
-SRC_URI="mirror://ohnoproto/${P}.tar.gz"
+SRC_URI="mirror://ohnoproto/phpcaptcha-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,20 +18,20 @@ IUSE=""
 S=${WORKDIR}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-pic.patch
+	epatch "${FILESDIR}"/phpcaptcha-${PV}-pic.patch
 
 	mkdir securimage-doc || die
-	mv -v securimage/README* securimage-doc/ || die
+	mv -v ${PN}/README* securimage-doc/ || die
 
 	# it's good that the license is distributed, we just don't want to
 	# install it below.
-	rm -v securimage/LICENSE.txt || die
+	rm -v ${PN}/LICENSE.txt || die
 }
 
 src_install()
 {
 	insinto /usr/share/php
-	doins -r securimage || die
+	doins -r ${PN} || die
 
 	dodoc securimage-doc/* || die
 }