diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog for [`clash-prelude` package](http://hackage.haskell.org/package/clash-prelude)
 
+## 0.10.14 *August 21st 2016*
+* Build against ghc-typelits-extra-0.2
+
 ## 0.10.13 *August 18th 2016*
 * New features:
   * Thanks to Joe Hermaszewski (@expipiplus1): Add an explicitly clocked `DSignal`
diff --git a/clash-prelude.cabal b/clash-prelude.cabal
--- a/clash-prelude.cabal
+++ b/clash-prelude.cabal
@@ -1,5 +1,5 @@
 Name:                 clash-prelude
-Version:              0.10.13
+Version:              0.10.14
 Synopsis:             CAES Language for Synchronous Hardware - Prelude library
 Description:
   CλaSH (pronounced ‘clash’) is a functional hardware description language that
@@ -159,7 +159,7 @@
                       integer-gmp               >= 0.5.1.0 && < 1.1,
                       deepseq                   >= 1.4.1.0 && < 1.5,
                       ghc-prim                  >= 0.3.1.0 && < 0.6,
-                      ghc-typelits-extra        >= 0.1     && < 0.2,
+                      ghc-typelits-extra        >= 0.1     && < 0.3,
                       ghc-typelits-natnormalise >= 0.4.1   && < 0.6,
                       lens                      >= 4.9     && < 4.15,
                       QuickCheck                >= 2.7     && < 2.10,
diff --git a/src/CLaSH/Prelude.hs b/src/CLaSH/Prelude.hs
--- a/src/CLaSH/Prelude.hs
+++ b/src/CLaSH/Prelude.hs
@@ -128,7 +128,11 @@
 import Data.Bits
 import Data.Default
 import GHC.TypeLits
+#if MIN_VERSION_ghc_typelits_extra(0,2,0)
+import GHC.TypeLits.Extra hiding (Max, Min)
+#else
 import GHC.TypeLits.Extra
+#endif
 import Language.Haskell.TH.Syntax  (Lift(..))
 #if __GLASGOW_HASKELL__ < 711
 import Language.Haskell.TH.Lift    (deriveLift)
diff --git a/src/CLaSH/Prelude/Safe.hs b/src/CLaSH/Prelude/Safe.hs
--- a/src/CLaSH/Prelude/Safe.hs
+++ b/src/CLaSH/Prelude/Safe.hs
@@ -27,6 +27,7 @@
   Some circuit examples can be found in "CLaSH.Examples".
 -}
 
+{-# LANGUAGE CPP              #-}
 {-# LANGUAGE DataKinds        #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE TypeOperators    #-}
@@ -108,7 +109,11 @@
 import Control.Applicative
 import Data.Bits
 import GHC.TypeLits
+#if MIN_VERSION_ghc_typelits_extra(0,2,0)
+import GHC.TypeLits.Extra hiding (Max, Min)
+#else
 import GHC.TypeLits.Extra
+#endif
 import Prelude                     hiding ((++), (!!), concat, drop, foldl,
                                            foldl1, foldr, foldr1, head, init,
                                            iterate, last, length, map, repeat,