diff --git a/CHANGELOG b/CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Changes in 1.6.16
+  * Fixes to accomodate GHC 8.4
+
 Changes in 1.6.13
   * Parse things like <function> and <Function> as constructors
 
diff --git a/Text/Show/Pretty.hs b/Text/Show/Pretty.hs
--- a/Text/Show/Pretty.hs
+++ b/Text/Show/Pretty.hs
@@ -11,6 +11,7 @@
 -- Functions for human-readable derived 'Show' instances.
 --------------------------------------------------------------------------------
 
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE Safe #-}
 module Text.Show.Pretty
   ( -- * Generic representation of values
@@ -46,6 +47,12 @@
 import Data.Foldable(Foldable,toList)
 import Language.Haskell.Lexer(rmSpace,lexerPass0)
 import Paths_pretty_show (getDataDir)
+
+#if MIN_VERSION_base(4,11,0)
+import Prelude hiding ( (<>) )
+#else
+import Prelude
+#endif
 
 {-# DEPRECATED ppValue "Please use `valToDoc` instead." #-}
 ppValue :: Value -> Doc
diff --git a/dist/build/Text/Show/Parser.hs b/dist/build/Text/Show/Parser.hs
--- a/dist/build/Text/Show/Parser.hs
+++ b/dist/build/Text/Show/Parser.hs
@@ -1011,6 +1011,7 @@
 
 
 
+
 {-# LINE 10 "<command-line>" #-}
 {-# LINE 1 "/home/diatchki/tools/ghc-8.2.1/lib/ghc-8.2.1/include/ghcversion.h" #-}
 
@@ -1029,7 +1030,91 @@
 
 
 {-# LINE 10 "<command-line>" #-}
-{-# LINE 1 "/tmp/ghc20788_0/ghc_2.h" #-}
+{-# LINE 1 "/tmp/ghc23551_0/ghc_2.h" #-}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/pretty-show.cabal b/pretty-show.cabal
--- a/pretty-show.cabal
+++ b/pretty-show.cabal
@@ -1,5 +1,5 @@
 name:           pretty-show
-version:        1.6.15
+version:        1.6.16
 category:       Text
 
 synopsis:       Tools for working with derived `Show` instances and generic
@@ -21,6 +21,10 @@
 
 cabal-version:  >= 1.8
 build-type:     Simple
+
+tested-with:    GHC == 7.10.3
+                GHC == 8.0.2
+                GHC == 8.2.2
 
 data-files:
   style/jquery.js