diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
index 9eace6ea05461..3a54b3d1ca4a2 100644
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
@@ -5,11 +5,17 @@ EAPI=8
 
 DESCRIPTION="PKCS#11 support for GnuPG"
 HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
-SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/alonbl/gnupg-pkcs11-scd.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="proxy"
 
 DEPEND="
@@ -17,16 +23,24 @@ DEPEND="
 	<dev-libs/libassuan-3:=
 	dev-libs/libgcrypt:=
 	dev-libs/libgpg-error:=
-	dev-libs/pkcs11-helper:="
+	dev-libs/pkcs11-helper:=
+"
 RDEPEND="
 	${DEPEND}
 	proxy? (
 		acct-group/gnupg-pkcs11
 		acct-group/gnupg-pkcs11-scd-proxy
 		acct-user/gnupg-pkcs11-scd-proxy
-	)"
+	)
+"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable proxy)
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild
index 338e9e3bd924f..57940c3a99e98 100644
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild
@@ -9,11 +9,11 @@ HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/alonbl/gnupg-pkcs11-scd.git"
 	inherit autotools git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
+
 LICENSE="BSD"
 SLOT="0"
 IUSE="proxy"
@@ -23,18 +23,25 @@ DEPEND="
 	dev-libs/libassuan:=
 	dev-libs/libgcrypt:=
 	dev-libs/libgpg-error:=
-	dev-libs/pkcs11-helper:="
+	dev-libs/pkcs11-helper:=
+"
 RDEPEND="
 	${DEPEND}
 	proxy? (
 		acct-group/gnupg-pkcs11
 		acct-group/gnupg-pkcs11-scd-proxy
 		acct-user/gnupg-pkcs11-scd-proxy
-	)"
+	)
+"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
 src_configure() {
-	eautoreconf
 	local myeconfargs=(
 		$(use_enable proxy)
 		--with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd