diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index b13b745726bd..9b9b8e272a17 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -78,7 +78,6 @@ DIST_SUBDIR?=	cabal
 MASTER_SITES?=	https://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/ \
 		http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/
 DISTFILES?=	${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX}
-EXTRACT_ONLY?=	${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX}
 .  endif
 
 _USES_extract=	701:cabal-post-extract
@@ -101,9 +100,6 @@ _REV=			${package:C/[^_]*//:S/_//}
 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}
@@ -111,6 +107,10 @@ DISTFILES+=	${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal:${p
 
 .  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}
 	${RM} -rf ${CABAL_HOME}/.cabal
diff --git a/devel/elm-format/Makefile b/devel/elm-format/Makefile
index 2c8ca6734a9e..9101e9ed9593 100644
--- a/devel/elm-format/Makefile
+++ b/devel/elm-format/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	elm-format
 PORTVERSION=	0.8.3
 PORTREVISION=	2
 CATEGORIES=	devel textproc
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Elm source code formatter based on the official Elm Style Guide
diff --git a/devel/stack/Makefile b/devel/stack/Makefile
index 13d6cadd620c..4a32c33c933d 100644
--- a/devel/stack/Makefile
+++ b/devel/stack/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	stack
 PORTVERSION=	2.5.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel haskell
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Cross-platform program for developing Haskell programs
diff --git a/lang/elm/Makefile b/lang/elm/Makefile
index 15ce91834336..bef918a649b8 100644
--- a/lang/elm/Makefile
+++ b/lang/elm/Makefile
@@ -6,8 +6,6 @@ PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/arrowd/:package_list
 DISTFILES=	elm-compiler-bootstrap-${PORTVERSION}${EXTRACT_SUFX}:package_list
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
-		elm-compiler-bootstrap-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Delightful language for reliable webapps
diff --git a/math/hs-penrose/Makefile b/math/hs-penrose/Makefile
index fdae966ea2a9..923541b3ff10 100644
--- a/math/hs-penrose/Makefile
+++ b/math/hs-penrose/Makefile
@@ -6,7 +6,6 @@ DISTVERSION=	0.1-737
 DISTVERSIONSUFFIX=	-gb336c8d
 PORTREVISION=	3
 CATEGORIES=	math haskell
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Create diagrams by typing mathematical notation in plain text
diff --git a/net-im/matterhorn/Makefile b/net-im/matterhorn/Makefile
index e22d9dcb0baf..0dc6018d7ed3 100644
--- a/net-im/matterhorn/Makefile
+++ b/net-im/matterhorn/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	matterhorn
 PORTVERSION=	50200.10.1
 CATEGORIES=	net-im
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Feature-rich Unix terminal client for the Mattermost chat system
diff --git a/sysutils/hs-cputype/Makefile b/sysutils/hs-cputype/Makefile
index 5b1e5722788a..3aae0e6c81f1 100644
--- a/sysutils/hs-cputype/Makefile
+++ b/sysutils/hs-cputype/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	cputype
 PORTVERSION=	0.2.1
 CATEGORIES=	sysutils haskell
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Find out your CPUTYPE
diff --git a/x11/conlecterm/Makefile b/x11/conlecterm/Makefile
index 42fa8d500ef4..b5d700974dd1 100644
--- a/x11/conlecterm/Makefile
+++ b/x11/conlecterm/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	conlecterm
 PORTVERSION=	1.4.3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	hsw@bitmark.com
 COMMENT=	Multi tabbed terminal for rxvt/xterm/emacs