diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
new file mode 100644
index 00000000000..7d2bf11cbc6
--- /dev/null
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -0,0 +1,32 @@
+flags:
+  git-annex:
+    concurrentoutput: true
+    production: true
+    assistant: true
+    pairing: true
+    cryptonite: true
+    network-uri: true
+    s3: true
+    testsuite: true
+    webdav: true
+    torrentparser: true
+    webapp: true
+    magicmime: false
+    dbus: false
+    xmpp: false
+    android: false
+    androidsplice: false
+packages:
+- '.'
+extra-deps:
+- bloomfilter-2.0.1.0
+- esqueleto-2.4.3
+- network-multicast-0.1.1
+- persistent-2.2.4.1
+- persistent-sqlite-2.2.1
+- persistent-template-2.1.8.1
+- torrent-10000.0.0
+- yesod-default-1.2.0
+explicit-setup-deps:
+  git-annex: true
+resolver: lts-7.0
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 8b341b34625..e61b344d59f 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,10 +1,10 @@
 # Template file for 'git-annex'
 pkgname=git-annex
 version=6.20160907
-revision=1
+revision=2
 nocross=yes
 build_style=haskell-stack
-stackage="lts-6.16"
+stackage="lts-7.0"
 hostmakedepends="ghc stack pkg-config"
 makedepends="gsasl-devel gnutls-devel libxml2-devel rsync curl lsof gnupg2 file-devel"
 # depends are utilities required by git-annex