diff --git a/app-admin/htpasswd/Manifest b/app-admin/htpasswd/Manifest
new file mode 100644
index 00000000..8fa9312c
--- /dev/null
+++ b/app-admin/htpasswd/Manifest
@@ -0,0 +1 @@
+EBUILD htpasswd-9999.ebuild 807 RMD160 3e4b4a314e68e5d15c2bc11f42f8bded6e88ab9f SHA1 b519df1ddac57fff6fbc9674ce6610b15bc1f050 SHA256 1d4a19202512df0e12bfd57a8adf3c46efaf057dc5ada02d261224ec06018d27
diff --git a/app-admin/htpasswd/htpasswd-9999.ebuild b/app-admin/htpasswd/htpasswd-9999.ebuild
new file mode 100644
index 00000000..b7ef71d0
--- /dev/null
+++ b/app-admin/htpasswd/htpasswd-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/backbone/htpasswd.git"}
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="ftp://backbone.ws/projects/htpasswd/${P}.tar.bz2"
+	KEYWORDS="-* ~x86 ~amd64"
+fi
+
+DESCRIPTION="Automated Gentoo upgrading"
+
+HOMEPAGE="https://chili.backbone.ws/projects/htpasswd"
+
+SLOT="0"
+
+LICENSE="GPL-3"
+
+IUSE=""
+
+DEPEND=""
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		# Allow user patches to be applied without modifying the ebuild
+		epatch_user
+	fi
+}
+
+src_install() {
+	if [[ ${PV} == "9999" ]] ; then
+		emake install DESTDIR="${D}"
+	else
+		emake install DESTDIR="${D}" || die
+	fi
+}