diff --git a/.gitignore b/.gitignore
index e318496..33fe5e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /cabal-dev
 /cabal.sandbox.config
 /dist
-/dist-newstyle
+/dist-*
 .*
 *~
diff --git a/src/Control/Monad/Base.hs b/src/Control/Monad/Base.hs
index 523d637..52a40de 100644
--- a/src/Control/Monad/Base.hs
+++ b/src/Control/Monad/Base.hs
@@ -52,8 +52,13 @@ import qualified Control.Monad.ST.Strict as S
 import Data.Orphans ()
 #endif
 #if MIN_VERSION_base(4,4,0)
+# if MIN_VERSION_base(4,8,0)
+import qualified Control.Monad.ST.Lazy as L
+import qualified Control.Monad.ST.Strict as S
+# else
 import qualified Control.Monad.ST.Lazy.Safe as L
 import qualified Control.Monad.ST.Safe as S
+# endif
 #endif
 import Control.Monad.STM (STM)