diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index 8903c973d69..21f8938b194 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -1,15 +1,29 @@
-resolver: lts-14.1
-packages:
-- .
-extra-deps:
-- IfElse-0.85
-- aws-0.21.1
-- bloomfilter-2.0.1.0
-- tasty-rerun-1.1.14
-- sandi-0.5
 flags:
   git-annex:
+    production: true
+    assistant: true
+    pairing: true
+    s3: true
+    webdav: true
+    torrentparser: true
+    webapp: true
     magicmime: false
     dbus: false
-    torrentparser: false
+    debuglocks: false
+    benchmark: false
     networkbsd: false
+packages:
+- '.'
+extra-deps:
+ - IfElse-0.85
+ - aws-0.22
+ - bloomfilter-2.0.1.0
+ - filepath-bytestring-1.4.2.1.6
+ - sandi-0.5
+ - tasty-rerun-1.1.17
+ - torrent-10000.1.1
+ - bencode-0.6.1.1@sha256:55b2f5653738754182c124caa8ba2eb533dfaf24fa2c4c73438edee406188b22,1930
+ - network-multicast-0.3.2@sha256:521547635a6afae408ec25193b3e429082dc0442668dac7ad5cea76ccee39750,979
+explicit-setup-deps:
+  git-annex: true
+resolver: lts-15.4
diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch
new file mode 100644
index 00000000000..9422ed3e0de
--- /dev/null
+++ b/srcpkgs/git-annex/patches/ghc8.8.3.patch
@@ -0,0 +1,18 @@
+--- git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
++++ git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
+@@ -304,6 +304,7 @@
+   Build-Depends:
+    base (>= 4.11.1.0 && < 5.0),
+    network-uri (>= 2.6),
++   network-bsd,
+    optparse-applicative (>= 0.14.1),
+    containers (>= 0.5.8),
+    exceptions (>= 0.6),
+@@ -404,3 +404,3 @@ if flag(NetworkBSD)
+     Build-Depends: network-bsd, network (>= 3.0.0.0)
+   else
+-    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
++    Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0)
+
+   if flag(S3)
+     Build-Depends: aws (>= 0.20)
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 1b10957c4b8..7550b7c6b3e 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,19 +1,18 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=7.20191114
-revision=3
+version=8.20200330
+revision=1
 build_style=haskell-stack
-hostmakedepends="pkg-config ghc stack"
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
- lsof rsync"
+ lsof rsync git"
 # depends are utilities required by git-annex
 depends="git rsync curl lsof gnupg2"
 short_desc="Git addon for managing large files"
 maintainer="Evan Deaubl <evan@deaubl.name>"
-license="AGPL-3.0-or-later, MIT, BSD-2-clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0, custom:icon-license"
+license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license"
 homepage="http://git-annex.branchable.com"
-distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=e29377764d55dbec74b7020680a4871d11532b239421d44215780f9b7408c182
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
+checksum=5b9306bda8d89a8f8942a2763686640d985ce8cffb7bf2086d8e913c4fa3c077
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 
@@ -28,6 +27,5 @@ post_install() {
 	vmkdir usr/share/man/man1
 	vcopy man/*.1 usr/share/man/man1
 
-	vinstall bash-completion.bash 0644 usr/share/bash-completion/completions git-annex
-	vlicense COPYRIGHT
+	vlicense doc/license/AGPL
 }