diff --git a/dev-db/sqlmap/sqlmap-0.9_p20150601.ebuild b/dev-db/sqlmap/sqlmap-0.9_p20150601.ebuild
deleted file mode 100644
index e7dc7ba09..000000000
--- a/dev-db/sqlmap/sqlmap-0.9_p20150601.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 git-2
-
-DESCRIPTION="A tool that automates the process of detecting and exploiting SQL injection flaws"
-HOMEPAGE="http://sqlmap.org"
-EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap.git"
-EGIT_COMMIT="515ba5fb314476fa216df66f17f9316ef2b570ea"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-QA_PREBUILT="
-	usr/share/${PN}/udf/mysql/linux/32/lib_mysqludf_sys.so
-	usr/share/${PN}/udf/mysql/linux/64/lib_mysqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.2/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.3/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.4/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/9.0/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/9.1/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.3/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.4/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/9.0/lib_postgresqludf_sys.so"
-
-src_install () {
-	# fix broken tarball
-	find ./ -name .git | xargs rm -rf
-	# Don't forget to disable the revision check since we removed the SVN files
-	sed -i -e 's/= getRevisionNumber()/= "Unknown revision"/' lib/core/settings.py
-
-	dodoc -r doc/*
-	rm -rf doc/
-	dodir /usr/share/${PN}/
-
-	cp -R * "${ED}"/usr/share/${PN}/
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	dosym /usr/share/${PN}/sqlmap.py /usr/bin/${PN}
-}
diff --git a/dev-db/sqlmap/sqlmap-0.9_p20150720.ebuild b/dev-db/sqlmap/sqlmap-0.9_p20150720.ebuild
deleted file mode 100644
index 8cb274296..000000000
--- a/dev-db/sqlmap/sqlmap-0.9_p20150720.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 git-2
-
-DESCRIPTION="A tool that automates the process of detecting and exploiting SQL injection flaws"
-HOMEPAGE="http://sqlmap.org"
-EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap.git"
-EGIT_COMMIT="75ed5f767c2484f53833a225171331465391f714"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-QA_PREBUILT="
-	usr/share/${PN}/udf/mysql/linux/32/lib_mysqludf_sys.so
-	usr/share/${PN}/udf/mysql/linux/64/lib_mysqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.2/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.3/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.4/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/9.0/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/9.1/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.3/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.4/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/9.0/lib_postgresqludf_sys.so"
-
-src_install () {
-	# fix broken tarball
-	find ./ -name .git | xargs rm -rf
-	# Don't forget to disable the revision check since we removed the SVN files
-	sed -i -e 's/= getRevisionNumber()/= "Unknown revision"/' lib/core/settings.py
-
-	dodoc -r doc/*
-	rm -rf doc/
-	dodir /usr/share/${PN}/
-
-	cp -R * "${ED}"/usr/share/${PN}/
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	dosym /usr/share/${PN}/sqlmap.py /usr/bin/${PN}
-}
diff --git a/dev-db/sqlmap/sqlmap-0.9_p20150218.ebuild b/dev-db/sqlmap/sqlmap-0.9_p20150915.ebuild
similarity index 93%
rename from dev-db/sqlmap/sqlmap-0.9_p20150218.ebuild
rename to dev-db/sqlmap/sqlmap-0.9_p20150915.ebuild
index 630a19de6..a73d11937 100644
--- a/dev-db/sqlmap/sqlmap-0.9_p20150218.ebuild
+++ b/dev-db/sqlmap/sqlmap-0.9_p20150915.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -10,7 +10,8 @@ inherit python-single-r1 git-2
 DESCRIPTION="A tool that automates the process of detecting and exploiting SQL injection flaws"
 HOMEPAGE="http://sqlmap.org"
 EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap.git"
-EGIT_COMMIT="6cc092b926eaafb1a8439ebe680960120ce9aca3"
+EGIT_COMMIT="c59ead36cee6f792f3fe6b5d2bcc4729eba3dffb"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-db/sqlmap/sqlmap-9999.ebuild b/dev-db/sqlmap/sqlmap-9999.ebuild
index 14f3a6aa0..a69cd0252 100644
--- a/dev-db/sqlmap/sqlmap-9999.ebuild
+++ b/dev-db/sqlmap/sqlmap-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5