diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index 9b9b8e272a17..0a5d699b7d6a 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -80,6 +80,8 @@ MASTER_SITES?=	https://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/ \
 DISTFILES?=	${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX}
 .  endif
 
+EXTRACT_ONLY?=	${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX}
+
 _USES_extract=	701:cabal-post-extract
 _USES_patch=	701:cabal-post-patch
 _USES_stage=	751:cabal-post-install-script
@@ -101,15 +103,16 @@ MASTER_SITES+=	https://hackage.haskell.org/package/:${package:C/[\.-]//g} \
 		http://hackage.haskell.org/package/:${package:C/[\.-]//g}
 DISTFILES+=	${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${CABAL_EXTRACT_SUFX}:${package:C/[\.-]//g}
 
+.    if !defined(CABAL_BOOTSTRAP)
+EXTRACT_ONLY+=	${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${CABAL_EXTRACT_SUFX}
+.    endif
+
 .    if ${package:C/[^_]*//:S/_//} != ""
 DISTFILES+=	${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal:${package:C/[\.-]//g}
 .    endif
 
 .  endfor
 
-.    if !defined(CABAL_BOOTSTRAP)
-EXTRACT_ONLY=	${DISTFILES:C/:.*//:N*\.cabal}
-.    endif
 
 # Fetches and unpacks package source from Hackage using only PORTNAME and PORTVERSION.
 cabal-extract: ${WRKDIR}