diff --git a/dev-vcs/git/git-2.17.0_rc1.ebuild b/dev-vcs/git/git-2.17.0_rc1.ebuild
index 29ff3e4669de6..9079b03f7b100 100644
--- a/dev-vcs/git/git-2.17.0_rc1.ebuild
+++ b/dev-vcs/git/git-2.17.0_rc1.ebuild
@@ -254,6 +254,7 @@ exportmakeopts() {
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		if use doc ; then
 			pushd "${S}"/Documentation &>/dev/null || die
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 29ff3e4669de6..9079b03f7b100 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -254,6 +254,7 @@ exportmakeopts() {
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		if use doc ; then
 			pushd "${S}"/Documentation &>/dev/null || die
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 29ff3e4669de6..9079b03f7b100 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -254,6 +254,7 @@ exportmakeopts() {
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		if use doc ; then
 			pushd "${S}"/Documentation &>/dev/null || die
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 29ff3e4669de6..9079b03f7b100 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -254,6 +254,7 @@ exportmakeopts() {
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		if use doc ; then
 			pushd "${S}"/Documentation &>/dev/null || die
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 29ff3e4669de6..9079b03f7b100 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -254,6 +254,7 @@ exportmakeopts() {
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		if use doc ; then
 			pushd "${S}"/Documentation &>/dev/null || die