diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
index 4c02aba0ce3f5..d045c3a64598d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
@@ -212,9 +212,6 @@ src_configure() {
 	# Save version information in the Emacs binary. It will be available
 	# in variable "system-configuration-options".
 	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
 
 	econf \
 		--program-suffix="-${EMACS_SUFFIX}" \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild
index d65f76bf48179..c86711715db04 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild
@@ -225,9 +225,6 @@ src_configure() {
 	# Save version information in the Emacs binary. It will be available
 	# in variable "system-configuration-options".
 	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
 
 	econf \
 		--program-suffix="-${EMACS_SUFFIX}" \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
index 9ae7f13c98cec..4a551eda5d7de 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
@@ -225,9 +225,6 @@ src_configure() {
 	# Save version information in the Emacs binary. It will be available
 	# in variable "system-configuration-options".
 	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
 
 	econf \
 		--program-suffix="-${EMACS_SUFFIX}" \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild
index f0c8c47ca34ae..faaea0a6c8c72 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild
@@ -212,9 +212,6 @@ src_configure() {
 	# Save version information in the Emacs binary. It will be available
 	# in variable "system-configuration-options".
 	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
 
 	econf \
 		--program-suffix="-${EMACS_SUFFIX}" \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
index c66d03f4343a1..0569edeedcfa2 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
@@ -225,9 +225,6 @@ src_configure() {
 	# Save version information in the Emacs binary. It will be available
 	# in variable "system-configuration-options".
 	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
 
 	econf \
 		--program-suffix="-${EMACS_SUFFIX}" \