From 1184c7447b90613789ecf301badf77ef16ec5a0b Mon Sep 17 00:00:00 2001
From: Simon Jakobi <simon.jakobi@gmail.com>
Date: Mon, 29 Aug 2016 18:01:33 +0200
Subject: [PATCH] Highlight and enhance changelog note for system-ghc behaviour
 change

---
 ChangeLog.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 5cf6e7d24a..6a9f212884 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -6,12 +6,17 @@ Release notes:
 
 Major changes:
 
-Behavior changes:
+* Stack will now always use its own GHC installation, even when a suitable GHC
+  installation is available on the PATH. To get the old behaviour, use
+  the `--system-ghc` flag or set `system-ghc: true` in your ~/.stack/config.yaml.
 
-* Use a stack-installed, isolated GHC by default, ignoring any system
-  installations (overridable with `--system-ghc`).
+  NB: Scripts that previously used stack in combination with a system GHC
+  installation should now include a `stack setup` line or use the `--install-ghc`
+  flag.
   [#2221](https://github.com/commercialhaskell/stack/issues/2221)
 
+Behavior changes:
+
 Other enhancements:
 
 Bug fixes: