diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+1.2.1.3
+---
+* fixed a name clash with GHC.TypeLits for base >= 4.11.0
+
 1.2.1.2
 ---
 * exported the `/` type operator with `ExplicitNamespaces` enabled to
diff --git a/modular-arithmetic.cabal b/modular-arithmetic.cabal
--- a/modular-arithmetic.cabal
+++ b/modular-arithmetic.cabal
@@ -1,5 +1,5 @@
 name:                modular-arithmetic
-version:             1.2.1.2
+version:             1.2.1.3
 synopsis:            A type for integers modulo some constant.
 
 description:         A convenient type for working with integers modulo some constant. It saves you from manually wrapping numeric operations all over the place and prevents a range of simple mistakes. @Integer `Mod` 7@ is the type of integers (mod 7) backed by @Integer@.
@@ -34,4 +34,4 @@
   type:                exitcode-stdio-1.0
   build-depends:       base >= 4.7 && < 5
                      , Glob >= 0.7 && < 0.8
-                     , doctest >= 0.9 && < 0.12
+                     , doctest >= 0.9 && < 0.15
diff --git a/src/Data/Modular.hs b/src/Data/Modular.hs
--- a/src/Data/Modular.hs
+++ b/src/Data/Modular.hs
@@ -6,7 +6,7 @@
 {-# LANGUAGE TypeFamilies        #-}
 
 {-# LANGUAGE ExplicitNamespaces  #-}
-
+{-# LANGUAGE CPP#-}
 -- |
 -- Types for working with integers modulo some constant.
 module Data.Modular (
@@ -27,7 +27,11 @@
 import           Data.Proxy    (Proxy (..))
 import           Data.Ratio    ((%))
 
+#if MIN_VERSION_base(4,11,0)
+import           GHC.TypeLits hiding (Mod)
+#else
 import           GHC.TypeLits
+#endif
 
 -- $setup
 --