diff --git a/Github/Data.hs b/Github/Data.hs
index 26926da7..f9d24c8c 100644
--- a/Github/Data.hs
+++ b/Github/Data.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveDataTypeable, OverloadedStrings #-}
+{-# LANGUAGE CPP, DeriveDataTypeable, OverloadedStrings #-}
 
 -- | This module re-exports the @Github.Data.Definitions@ module, adding
 -- instances of @FromJSON@ to it. If you wish to use the data without the
@@ -6,16 +6,21 @@
 
 module Github.Data (module Github.Data.Definitions) where
 
-import Data.Time
 import Control.Applicative
 import Control.Monad
 import qualified Data.Text as T
 import Data.Aeson.Types
-import System.Locale (defaultTimeLocale)
 import qualified Data.Vector as V
 import qualified Data.HashMap.Lazy as Map
 import Data.Hashable (Hashable)
 
+#if MIN_VERSION_base(4,8,0)
+import Data.Time
+#else
+import Data.Time
+import System.Locale (defaultTimeLocale)
+#endif
+
 import Github.Data.Definitions
 
 instance FromJSON GithubDate where
diff --git a/Github/Issues.hs b/Github/Issues.hs
index 88bea3fa..6bd03bcc 100644
--- a/Github/Issues.hs
+++ b/Github/Issues.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP, OverloadedStrings #-}
 -- | The issues API as described on <http://developer.github.com/v3/issues/>.
 module Github.Issues (
  issue
@@ -16,8 +16,13 @@ module Github.Issues (
 import Github.Data
 import Github.Private
 import Data.List (intercalate)
-import Data.Time.Format (formatTime)
+#if MIN_VERSION_base(4, 8, 0)
+import Data.Time (defaultTimeLocale)
+#else
 import System.Locale (defaultTimeLocale)
+#endif
+
+import Data.Time.Format (formatTime)
 import Data.Time.Clock (UTCTime(..))
 
 -- | A data structure for describing how to filter issues. This is used by
diff --git a/Github/Private.hs b/Github/Private.hs
index 3ede8800..ebb296fd 100644
--- a/Github/Private.hs
+++ b/Github/Private.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings, StandaloneDeriving, DeriveDataTypeable #-}
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE CPP, FlexibleContexts #-}
 module Github.Private where
 
 import Github.Data
diff --git a/github.cabal b/github.cabal
index da76af0d..494a04f2 100644
--- a/github.cabal
+++ b/github.cabal
@@ -7,7 +7,7 @@ Name:                github
 -- The package version. See the Haskell package versioning policy
 -- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for
 -- standards guiding when and how versions should be incremented.
-Version:             0.13.1
+Version:             0.13.2
 
 -- A short (one-line) description of the package.
 Synopsis:            Access to the Github API, v3.