diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
index ac289f40eb68a..1205062fedfcc 100644
--- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
@@ -110,19 +110,20 @@ pkg_pretend() {
 }
 
 src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
+        if [[ ${PV} == 9999 ]] ; then
+                git-r3_src_unpack
+                return
+        fi
 
-	if use verify-sig ; then
-		# Upstream sign the decompressed .tar
-		verify-sig_verify_detached \
-			<(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \
-			"${DISTDIR}"/${MY_P}.tar.sign
+	# Upstream sign the decompressed .tar
+	if use verify-sig; then
+		einfo "Unpacking ${MY_P}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+	else
+		default
 	fi
-
-	default
 }
 
 src_prepare() {
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index c9f50b8ca79a8..8e74d1439e60c 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -115,14 +115,15 @@ src_unpack() {
 		return
 	fi
 
-	if use verify-sig ; then
-		# Upstream sign the decompressed .tar
-		verify-sig_verify_detached \
-			<(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \
-			"${DISTDIR}"/${MY_P}.tar.sign
+	# Upstream sign the decompressed .tar
+	if use verify-sig; then
+		einfo "Unpacking ${MY_P}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+	else
+		default
 	fi
-
-	default
 }
 
 src_prepare() {