diff --git a/Control/Monad/Ghc.hs b/Control/Monad/Ghc.hs
--- a/Control/Monad/Ghc.hs
+++ b/Control/Monad/Ghc.hs
@@ -12,13 +12,21 @@
 import Control.Monad.CatchIO
 
 import qualified GHC ( runGhc, runGhcT )
-import qualified HscTypes   as GHC
 import qualified MonadUtils as GHC
 import qualified Exception  as GHC
+#if __GLASGOW_HASKELL__ >= 702
+import qualified GhcMonad   as GHC
+#else
+import qualified HscTypes   as GHC
+#endif
 
+
 newtype Ghc a = Ghc (GHC.Ghc a)
     deriving (Functor, Monad,
-              GHC.WarnLogMonad, GHC.ExceptionMonad, GHC.MonadIO, GHC.GhcMonad)
+#if __GLASGOW_HASKELL__ < 702
+              GHC.WarnLogMonad,
+#endif
+              GHC.ExceptionMonad, GHC.MonadIO, GHC.GhcMonad)
 
 instance MTL.MonadIO Ghc where
     liftIO = GHC.liftIO
@@ -56,9 +64,11 @@
     gblock   = block
     gunblock = unblock
 
+#if __GLASGOW_HASKELL__ < 702
 instance MTL.MonadIO m => GHC.WarnLogMonad (GhcT m) where
     setWarnings = GhcT . GHC.setWarnings
     getWarnings = GhcT GHC.getWarnings
+#endif
 
 instance (Functor m, MonadCatchIO m) => GHC.GhcMonad (GhcT m) where
     getSession = GhcT GHC.getSession
diff --git a/ghc-mtl.cabal b/ghc-mtl.cabal
--- a/ghc-mtl.cabal
+++ b/ghc-mtl.cabal
@@ -1,5 +1,5 @@
 name:               ghc-mtl
-version:            1.0.1.0
+version:            1.0.1.1
 description:        Provides an 'mtl' compatible version of the 'GhcT'
                     monad-transformer defined in the 'GHC-API' since version
                     6.10.1.
@@ -10,17 +10,17 @@
 license-file:       LICENSE
 author:             Daniel Gorin
 maintainer:         jcpetruzza@gmail.com
-homepage:         http://code.haskell.org/~jcpetruzza/ghc-mtl
+homepage:        http://darcsden.com/jcpetruzza/ghc-mtl
 
 cabal-version:      >= 1.2
 build-type:         Simple
 tested-with:        GHC==6.10
 
 Library
-  build-depends:      base >= 4,
+  build-depends:      base >= 4, base <= 5,
                       ghc >= 6.10,
                       mtl,
                       MonadCatchIO-mtl >= 0.2.0.0
   exposed-modules:    Control.Monad.Ghc
-  extensions:         GeneralizedNewtypeDeriving
+  extensions:         GeneralizedNewtypeDeriving, CPP
   ghc-options:        -Wall -O2