diff --git a/changelog.md b/changelog.md
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog for [`hoopl` package](http://hackage.haskell.org/package/hoopl)
 
+## 3.10.0.2  *Dec 2014*
+
+ - Add support for `base-4.8.0.0` package version
+
+ - Mark a few modules as Safe rather than Trustworthy
+
 ## 3.10.0.1  *Mar 2014*
 
   - Remove UTF8 character from hoopl.cabal to workaround issue
diff --git a/hoopl.cabal b/hoopl.cabal
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -1,13 +1,6 @@
 Name:                hoopl
-Version:             3.10.0.1
--- NOTE: Don't forget to update 'repository this' tag when incrementing version!
--- GHC 7.6.1 released with 3.9.0.0
--- version 3.8.6.0 is the version that goes with the camera-ready Haskell'10 paper
--- version 3.8.7.0 works with GHC 7
--- version 3.8.7.1 adds some unnamed functions without breaking compatibility
--- version 3.8.7.2 adds Compiler.Hoopl.Fuel.liftFuel
--- version 3.8.7.4 re-exports runWithFuel
--- version 3.9.0.0 adds the new API for working with blocks, and lots of internal refactoring
+Version:             3.10.0.2
+-- NOTE: Don't forget to update ./changelog.md
 Description:
   Higher-order optimization library
   .
@@ -24,18 +17,13 @@
 Cabal-Version:       >=1.10
 Synopsis:            A library to support dataflow analysis and optimization
 Category:            Compilers/Interpreters
-Tested-With:         GHC==7.6.3, GHC==7.6.2, GHC==7.6.1, GHC==7.4.2, GHC==7.4.1, GHC==7.2.2, GHC==7.0.4, GHC==7.0.3, GHC==7.0.2, GHC==7.0.1
+Tested-With:         GHC>=7.0.1
 Extra-Source-Files:  README, hoopl.pdf, changelog.md
 
 Source-repository head
   Type:       git
   Location:   http://git.haskell.org/packages/hoopl.git
 
-Source-repository this
-  Type:       git
-  Location:   http://git.haskell.org/packages/hoopl.git
-  Tag:        hoopl-3.10.0.1-release
-
 Library
   Default-Language:  Haskell2010
   Other-Extensions:  CPP
@@ -52,7 +40,7 @@
     Other-Extensions: Safe Trustworthy
 
   Hs-Source-Dirs:    src
-  Build-Depends:     base >= 4.3 && < 4.8, containers >= 0.4 && < 0.6
+  Build-Depends:     base >= 4.3 && < 4.9, containers >= 0.4 && < 0.6
   Exposed-Modules:   Compiler.Hoopl,
                      Compiler.Hoopl.Internals,
                      Compiler.Hoopl.Wrappers,
diff --git a/src/Compiler/Hoopl/Dataflow.hs b/src/Compiler/Hoopl/Dataflow.hs
--- a/src/Compiler/Hoopl/Dataflow.hs
+++ b/src/Compiler/Hoopl/Dataflow.hs
@@ -1,9 +1,11 @@
 {-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables, GADTs, TypeFamilies, MultiParamTypeClasses #-}
-#if __GLASGOW_HASKELL__ >= 703
-{- OPTIONS_GHC -fprof-auto #-}
-#endif
-#if __GLASGOW_HASKELL__ >= 701
+#if __GLASGOW_HASKELL__ >= 709
+{-# LANGUAGE Safe #-}
+#elif __GLASGOW_HASKELL__ >= 701
 {-# LANGUAGE Trustworthy #-}
+#endif
+#if __GLASGOW_HASKELL__ >= 703
+{-# OPTIONS_GHC -fprof-auto #-}
 #endif
 #if __GLASGOW_HASKELL__ < 701
 {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
diff --git a/src/Compiler/Hoopl/Unique.hs b/src/Compiler/Hoopl/Unique.hs
--- a/src/Compiler/Hoopl/Unique.hs
+++ b/src/Compiler/Hoopl/Unique.hs
@@ -1,8 +1,11 @@
 {-# LANGUAGE CPP, TypeFamilies #-}
-#if __GLASGOW_HASKELL__ >= 701
+#if __GLASGOW_HASKELL__ >= 709
+{-# LANGUAGE Safe #-}
+#elif __GLASGOW_HASKELL__ >= 701
 {-# LANGUAGE Trustworthy #-}
 #endif
 
+
 module Compiler.Hoopl.Unique
   ( Unique, intToUnique
   , UniqueSet, UniqueMap
@@ -21,7 +24,7 @@
 import qualified Data.IntMap as M
 import qualified Data.IntSet as S
 
-import Control.Applicative (Applicative(..))
+import Control.Applicative
 import Control.Monad (ap,liftM)
 
 -----------------------------------------------------------------------------
diff --git a/src/Compiler/Hoopl/XUtil.hs b/src/Compiler/Hoopl/XUtil.hs
--- a/src/Compiler/Hoopl/XUtil.hs
+++ b/src/Compiler/Hoopl/XUtil.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP, GADTs, RankNTypes, ScopedTypeVariables, TypeFamilies  #-}
-#if __GLASGOW_HASKELL__ >= 701
+#if __GLASGOW_HASKELL__ >= 709
+{-# LANGUAGE Safe #-}
+#elif __GLASGOW_HASKELL__ >= 701
 {-# LANGUAGE Trustworthy #-}
 #endif