diff --git a/www-misc/fcgiwrap/ChangeLog b/www-misc/fcgiwrap/ChangeLog
new file mode 100644
index 0000000..deeb062
--- /dev/null
+++ b/www-misc/fcgiwrap/ChangeLog
@@ -0,0 +1,51 @@
+# ChangeLog for www-misc/fcgiwrap
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/fcgiwrap/ChangeLog,v 1.11 2012/07/25 15:10:21 darkside Exp $
+
+  25 Jul 2012; Jeremy Olexa <darkside@gentoo.org> -fcgiwrap-1.0.3.ebuild,
+  fcgiwrap-1.0.3-r1.ebuild, fcgiwrap-9999.ebuild:
+  Fix fetch failure, cannot do a SRC_URI arrow from mirror://gentoo. Remove old
+  version
+
+  16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  fcgiwrap-1.0.3-r1.ebuild:
+  x86 stable wrt bug #400525
+
+  10 Feb 2012; Agostino Sarubbo <ago@gentoo.org> fcgiwrap-1.0.3-r1.ebuild:
+  Stable for amd64, wrt bug #400525
+
+  04 Oct 2011; Andreas Schuerch <nativemad@gentoo.org> fcgiwrap-1.0.3.ebuild:
+  x86 stable, bug 384475
+
+*fcgiwrap-1.0.3-r1 (01 Oct 2011)
+
+  01 Oct 2011; Peter Volkov <pva@gentoo.org> -fcgiwrap-1.0.2-r1.ebuild,
+  +fcgiwrap-1.0.3-r1.ebuild, fcgiwrap-9999.ebuild:
+  Bump EAPI, use emake in src_install, bug #385081 thank Nikoli for this job.
+
+  30 Sep 2011; Steve Dibb <beandog@gentoo.org> fcgiwrap-1.0.3.ebuild:
+  amd64 stable, bug 384475
+
+  21 Sep 2011; Michał Górny <mgorny@gentoo.org> fcgiwrap-9999.ebuild:
+  Migrate to git-2.
+
+  15 Sep 2010; Peter Volkov <pva@gentoo.org> fcgiwrap-1.0.3.ebuild:
+  Use gentoo mirrors for sources as upstream link disappears with time.
+
+*fcgiwrap-1.0.3 (15 Sep 2010)
+
+  15 Sep 2010; Peter Volkov <pva@gentoo.org> +fcgiwrap-1.0.3.ebuild:
+  Version bump, respect LDFLAGS, #336810 thank Diego E. 'Flameeyes' Pettenò
+  for report and Nikoli for the job.
+
+  13 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  metadata.xml:
+  Fix herd tag in metadata.xml
+
+*fcgiwrap-9999 (29 Jun 2010)
+*fcgiwrap-1.0.2-r1 (29 Jun 2010)
+
+  29 Jun 2010; Peter Volkov <pva@gentoo.org> +fcgiwrap-1.0.2-r1.ebuild,
+  +fcgiwrap-9999.ebuild, +metadata.xml:
+  Initial import, bug #325413, thank Nikoli for this job.
+
diff --git a/www-misc/fcgiwrap/Manifest b/www-misc/fcgiwrap/Manifest
new file mode 100644
index 0000000..9add242
--- /dev/null
+++ b/www-misc/fcgiwrap/Manifest
@@ -0,0 +1,4 @@
+DIST fcgiwrap-1.0.3.tar.gz 8846 SHA256 26578d698f006f6aecc83fa9608aa0fd04dd586dab75324114ff9b5d87869e66 SHA512 795e8849f57864877933bab63b23e3dc19f71780dd696484c4f9e39cf4b9362f7c0f923fce808fd7ee1aabed989eca40ed7031732c5e369cf731ab380a2a0195 WHIRLPOOL 1705ae8b17d19140d54114eef6ba211ecc45c9c9ef2109139c4e31107d761082f76f98f6b9233b5b4d01261f2433060afb99040afa500d981c8570f418dd6992
+EBUILD fcgiwrap-1.0.3-r2.ebuild 1065 SHA256 580ec4341044a431135aaf7e1be332c1bb73579e7547e6e5e416b1de536dc17a SHA512 1a964f65549e1956c7a9b10f5cbf0b625f571e2ab945188149f3ef827e3004eb3fc3cf348838afc2f0d97861086ca75fc8dad6c0c7b61941afa2efd5a32150b4 WHIRLPOOL 0aa7f14fddf1b304a053cbeceb5c84de15e18031facb4050b361575ad5623757e802f5d9745b9ab749ce9667a0a50c0c2e868c40d3215ee562970e7864603b73
+MISC ChangeLog 1886 SHA256 28c08f3da0c1b6a60456b6eef5ef14467d8cb90348189fbe1e06774e46ecc137 SHA512 dde394f093814c4762062bcb32352af874d569cf4e19f4d50b90d7011f7ecce3aa3a63c2cac05e3da61dd606b6302a104b17ce74a9c574d9f232e0c469a55e3b WHIRLPOOL d86469b24adf0b9d3b01815f86daa51a16c2ca85e3527abee4822f2d8e3615e62625c8fed731b3b184b2ff569f10910b12f32433df888b0b983f15050f454d6a
+MISC metadata.xml 518 SHA256 e9a7881014ae1016b582277c0f020e4af2edacf665ea595746a8ef38ae88e860 SHA512 9de74058bb68b29e076ae50f35854e1a861c66dedd55f0db28761ed5e48ec7b62b97b4b0539c014bfaa33422d58afae89ea446eb411e4e52a98306c3314d8343 WHIRLPOOL da54cb56134f9025b73ff8035899049b574cc1e09145e2beb408c10d14017ff3b7f541b0ba37cb20ac88a512352b5db807bf8d16b42b409679ab175dc7a1d739
diff --git a/www-misc/fcgiwrap/fcgiwrap-1.0.3-r2.ebuild b/www-misc/fcgiwrap/fcgiwrap-1.0.3-r2.ebuild
new file mode 100644
index 0000000..6c787b7
--- /dev/null
+++ b/www-misc/fcgiwrap/fcgiwrap-1.0.3-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/fcgiwrap/fcgiwrap-1.0.3-r1.ebuild,v 1.4 2012/07/25 15:10:21 darkside Exp $
+
+EAPI="4"
+
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git" || VCS_ECLASS=""
+inherit autotools ${VCS_ECLASS}
+
+DESCRIPTION="Simple FastCGI wrapper for CGI scripts (CGI support for nginx)"
+HOMEPAGE="http://nginx.localdomain.pl/wiki/FcgiWrap"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/gnosek/${PN}.git"
+
+	KEYWORDS=""
+else
+	MY_REV="58ec209"
+	#SRC_URI="http://download.github.com/gnosek-${P}-4-g${MY_REV}.tar.gz"
+	SRC_URI="mirror://gentoo/${P}.tar.gz"
+	S="${WORKDIR}/gnosek-${PN}-${MY_REV}"
+
+	KEYWORDS="amd64 x86"
+fi
+
+DEPEND="dev-libs/fcgi"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst )
+
+src_prepare() {
+	sed -e '/man8dir = $(DESTDIR)/s/@prefix@//' \
+		-i Makefile.in || die "sed failed"
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	einfo 'You may want to install www-servers/spawn-fcgi to use with fcgiwrap.'
+}
diff --git a/www-misc/fcgiwrap/metadata.xml b/www-misc/fcgiwrap/metadata.xml
new file mode 100644
index 0000000..7e708e4
--- /dev/null
+++ b/www-misc/fcgiwrap/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>pva@gentoo.org</email>
+	<name>Peter Volkov</name>
+</maintainer>
+<maintainer>
+	<email>nikoli@lavabit.com</email>
+	<name>Nikoli</name>
+</maintainer>
+<longdescription lang="en">
+	fcgiwrap is a simple server for running CGI applications over FastCGI. It
+	hopes to provide clean CGI support to Nginx (and other web servers that may
+	need it). 
+</longdescription>
+</pkgmetadata>