diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index d0f8de87ed5d..1a32907791c1 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	cabal-install
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	3.4.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Command-line interface for Cabal and Hackage
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	ghc:lang/ghc
 
 USES=		cabal:nodefault compiler:c11 python:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haskell
 GH_PROJECT=	cabal
 
 USE_CABAL=	async-2.2.2_1 \
 		base16-bytestring-0.1.1.7 \
 		base64-bytestring-1.1.0.0 \
 		cryptohash-sha256-0.11.101.0_4 \
 		digest-0.0.1.2 \
 		echo-0.1.3_1 \
 		ed25519-0.0.5.0_3 \
 		edit-distance-0.2.2.1_1 \
 		hackage-security-0.6.0.1_2 \
 		hashable-1.3.0.0_1 \
 		HTTP-4000.3.14_1 \
 		lukko-0.1.1.2 \
 		network-3.1.1.1 \
 		network-uri-2.6.3.0 \
 		random-1.2.0 \
 		regex-base-0.94.0.0_1 \
 		regex-posix-0.96.0.0_2 \
 		resolv-0.1.2.0 \
 		splitmix-0.1 \
 		tar-0.5.1.1_2 \
 		zlib-0.6.2.1_1
 
 CABAL_BOOTSTRAP=	yes
 
 PLIST_FILES=	bin/cabal
 
 post-extract:
 	${MKDIR} ${WRKSRC}/_build/tarballs/
 .for package in ${USE_CABAL}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${EXTRACT_SUFX} ${WRKSRC}/_build/tarballs/
 
 .	if ${package:C/[^_]*//:S/_//} != ""
 		${CP} ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal ${WRKSRC}/_build/tarballs/${package:C/[0-9._]*$//:S/-$//}.cabal
 .	else
 		tar -C ${WRKDIR} -xf ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${EXTRACT_SUFX} --include='*.cabal'
 		${MV} ${WRKDIR}/${package:C/_[0-9]+//}/${package:C/[0-9._]*$//:S/-$//}.cabal ${WRKSRC}/_build/tarballs/${package:C/[0-9._]*$//:S/-$//}.cabal
 .	endif
 .endfor
 
 do-build:
 	cd ${WRKSRC} && \
 		${PYTHON_CMD} bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/_build/bin/cabal ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json
index 85390fae20ba..2fcd94143618 100644
--- a/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json
+++ b/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json
@@ -1,43 +1,66 @@
---- bootstrap/linux-8.10.1.json.orig	2021-03-05 14:30:13 UTC
+--- bootstrap/linux-8.10.1.json.orig	2021-02-20 10:28:17 UTC
 +++ bootstrap/linux-8.10.1.json
+@@ -2,7 +2,7 @@
+     "builtin": [
+         {
+             "package": "rts",
+-            "version": "1.0"
++            "version": "1.0.1"
+         },
+         {
+             "package": "ghc-prim",
 @@ -14,7 +14,7 @@
          },
          {
              "package": "base",
 -            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
++            "version": "4.14.2.0"
          },
          {
              "package": "array",
-@@ -26,7 +26,7 @@
+@@ -26,11 +26,11 @@
          },
          {
              "package": "bytestring",
 -            "version": "0.10.10.0"
 +            "version": "0.10.12.0"
          },
          {
              "package": "containers",
+-            "version": "0.6.2.1"
++            "version": "0.6.4.1"
+         },
+         {
+             "package": "binary",
 @@ -62,7 +62,7 @@
          },
          {
              "package": "text",
 -            "version": "1.2.3.2"
 +            "version": "1.2.4.1"
          },
          {
              "package": "parsec",
 @@ -74,11 +74,11 @@
          },
          {
              "package": "process",
 -            "version": "1.6.8.2"
 +            "version": "1.6.9.0"
          },
          {
              "package": "ghc-boot-th",
 -            "version": "8.10.1"
-+            "version": "8.10.4"
++            "version": "8.10.5"
          },
          {
              "package": "template-haskell",
+@@ -86,7 +86,7 @@
+         },
+         {
+             "package": "stm",
+-            "version": "2.5.0.0"
++            "version": "2.5.0.1"
+         }
+     ],
+     "dependencies": [