diff --git a/System/Directory.hs b/System/Directory.hs
index d5c8abdd..b3c7fb88 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -1,5 +1,10 @@
 {-# LANGUAGE CPP, NondecreasingIndentation #-}
 
+#if !(MIN_VERSION_base(4,8,0))
+-- In base-4.8.0 the Foreign module became Safe
+{-# LANGUAGE Trustworthy #-}
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Directory
diff --git a/changelog.md b/changelog.md
index f3e6088e..6cea768e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,11 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
+## 1.2.3.1
+
+  * Restore support for Safe Haskell with base < 4.8
+    ([#30](https://github.com/haskell/directory/issues/30))
+
 ## 1.2.3.0 (July 2015)
 
   * Add support for XDG Base Directory Specification
diff --git a/directory.cabal b/directory.cabal
index 72f7b0a7..9f828991 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -1,5 +1,5 @@
 name:           directory
-version:        1.2.3.0
+version:        1.2.3.1
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE