diff --git a/CHANGELOG b/CHANGELOG
index ed5ab0c7fa..358abb4f5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ git-annex (6.20171027) UNRELEASED; urgency=medium
     work.
   * Makefile improvement for sudo make install.
     Thanks, Eric Siegerman 
+  * Makefile improvement for BUILDER=stack, use stack to run ghc.
 
  -- Joey Hess <id@joeyh.name>  Mon, 30 Oct 2017 12:01:45 -0400
 
diff --git a/Makefile b/Makefile
index 3d978df160..52f8b3a36a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,11 @@ all=git-annex git-annex-shell mans docs
 
 # set to "./Setup" if you lack a cabal program. Or can be set to "stack"
 BUILDER?=cabal
+ifeq ($(BUILDER),stack)
+GHC?=stack ghc --
+else
 GHC?=ghc
+endif
 
 PREFIX?=/usr
 SHAREDIR?=share