diff --git a/CHANGES.md b/CHANGES.md
index 86a10719b..e8cf01504 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,7 @@
 
 * Removes ``printf``
 * Removes ``string-conv`` dependency so Stack build works without ``extra-deps``.
+* Brings ``Callstack`` machinery in for GHC 8.x.
 
 0.1.5
 =====
diff --git a/src/Base.hs b/src/Base.hs
index cdbfadca6..2aa51cc6f 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -60,6 +60,25 @@ import GHC.OverloadedLabels as X (
     IsLabel(..)
   )
 
+import GHC.ExecutionStack as X (
+    Location(..),
+  , SrcLoc(..)
+  , getStackTrace
+  , showStackTrace
+  )
+
+import GHC.Stack as X (
+  , CallStack
+  , HasCallStack
+  , callStack
+  , SrcLoc
+  , prettySrcLoc
+  , currentCallStack
+  , getCallStack
+  , showCallStack
+  , prettyCallStack
+  )
+
 {-
 import GHC.Records as X (
     HasField(..)