diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
new file mode 100644
index 00000000000..6b55c176e15
--- /dev/null
+++ b/srcpkgs/stack/patches/ghc-8.8.4.patch
@@ -0,0 +1,70 @@
+--- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
++++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
+@@ -234,6 +234,7 @@
+     , base >=4.10 && <5
+     , base64-bytestring
+     , bytestring
++    , base16-bytestring == 0.1.1.7
+     , casa-client
+     , casa-types
+     , colour
+@@ -272,7 +273,7 @@
+     , neat-interpolation
+     , network-uri
+     , open-browser
+-    , optparse-applicative
++    , optparse-applicative == 0.15.1.0
+     , pantry >=0.5.1.3
+     , path
+     , path-io
+@@ -359,6 +360,7 @@
+     , base >=4.10 && <5
+     , base64-bytestring
+     , bytestring
++    , base16-bytestring == 0.1.1.7
+     , casa-client
+     , casa-types
+     , colour
+@@ -396,7 +398,7 @@
+     , neat-interpolation
+     , network-uri
+     , open-browser
+-    , optparse-applicative
++    , optparse-applicative == 0.15.1.0
+     , pantry >=0.5.1.3
+     , path
+     , path-io
+@@ -480,6 +482,7 @@
+     , base >=4.10 && <5
+     , base64-bytestring
+     , bytestring
++    , base16-bytestring == 0.1.1.7
+     , casa-client
+     , casa-types
+     , colour
+@@ -518,7 +521,7 @@
+     , neat-interpolation
+     , network-uri
+     , open-browser
+-    , optparse-applicative
++    , optparse-applicative == 0.15.1.0
+     , optparse-generic
+     , pantry >=0.5.1.3
+     , path
+@@ -609,6 +612,7 @@
+     , base >=4.10 && <5
+     , base64-bytestring
+     , bytestring
++    , base16-bytestring == 0.1.1.7
+     , casa-client
+     , casa-types
+     , colour
+@@ -647,7 +651,7 @@
+     , neat-interpolation
+     , network-uri
+     , open-browser
+-    , optparse-applicative
++    , optparse-applicative == 0.15.1.0
+     , pantry >=0.5.1.3
+     , path
+     , path-io
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index d33a2404a8f..257aba10e50 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.3.1
+version=2.5.1
 revision=1
-_stackage="lts-15.4"
+_stackage="lts-16.13"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -12,15 +12,15 @@ license="BSD-3-Clause"
 homepage="https://haskellstack.org"
 distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="6701ddfc6d0be0c2bf0f75c84375e41923c5617f04222c5e582e7011c7f8fb83
- 4147e6738cf6ef38cfd48048ef0992fb00e786068592e359fdb804e3d9ed4781"
+checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
+ b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"
 
 do_build() {
 	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config
-	HOME=$PWD cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'
+	HOME=$PWD cabal update
 	HOME=$PWD cabal new-build ${makejobs} --flag disable-git-info
 }