diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
deleted file mode 100644
index 982cd61..0000000
--- a/dev-db/lmdb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST LMDB_0.9.17.tar.gz 135816 SHA256 80a08218e40f76a0485ec18c42de6f1e020b1ed0268f7cb34c69746e8d98c72c SHA512 2f6108364973e01f6379613c02b9fa11933d6c91eadc5ae0cad55818bc0205041d0663a5dd936d89ec651eb1de0257390d48d549d1bc24ef29d7ee57c9fcb941 WHIRLPOOL 9ed1ed2857cc1282e30fa5a6ecab710bbb00f88f973a90228004194f7f52fe21053e27692e9ec9d0dedd33c6e204bd9f66702fd63e60c8a8a23f655acfbda474
diff --git a/dev-db/lmdb/lmdb-0.9.17.ebuild b/dev-db/lmdb/lmdb-9999.ebuild
similarity index 57%
rename from dev-db/lmdb/lmdb-0.9.17.ebuild
rename to dev-db/lmdb/lmdb-9999.ebuild
index 80903d9..7ecb068 100644
--- a/dev-db/lmdb/lmdb-0.9.17.ebuild
+++ b/dev-db/lmdb/lmdb-9999.ebuild
@@ -5,28 +5,32 @@
 EAPI=5
 inherit toolchain-funcs
 
+if [[ ${PV} = "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/LMDB/lmdb.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+fi
+
 DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
 HOMEPAGE="http://symas.com/mdb/"
-SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
 # =net-nds/openldap-2.4.40 installs lmdb files.
 RDEPEND="!=net-nds/openldap-2.4.40"
 
-S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
+S="${WORKDIR}/${P}/libraries/liblmdb"
 
 src_prepare() {
 	sed -i -e "s/^CC.*/CC = $(tc-getCC)/" \
 		-e "s/^CFLAGS.*/CFLAGS = ${CFLAGS}/" \
 		-e "s/^AR.*/AR = $(tc-getAR)/" \
-		-e "/mkdir/s:lib:$(get_libdir):" \
-		-e "/for f/s:lib:$(get_libdir):" \
-		-e "s:man/man1:share/man/man1:" \
 		-e "s:shared:shared -Wl,-soname,liblmdb.so.0:" \
 		"${S}/Makefile" || die
 }
@@ -36,14 +40,15 @@ src_configure() {
 }
 
 src_compile() {
-	emake LDLIBS+=" -pthread"
+	emake LDLIBS+=" -pthread" || die
 }
 
 src_install() {
-	emake DESTDIR="${ED}" prefix="${EROOT}usr" mandir="${EROOT}usr/share" install
+	emake DESTDIR="${ED}" prefix="${EROOT}usr" libdir="${EROOT}usr/$(get_libdir)" install || die
 
 	mv "${ED}"usr/$(get_libdir)/liblmdb.so{,.0} || die
 	dosym liblmdb.so.0 "${EROOT}"usr/$(get_libdir)/liblmdb.so
 
-	use static-libs || rm -f "${ED}"usr/$(get_libdir)/liblmdb.a
+	use static-libs || rm "${ED}"usr/$(get_libdir)/liblmdb.a || die
 }
+