diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,11 @@
+Version 0.6.0.6 released 2 April 2014
+
+* Added compatibility module Data.FileStore.Compat.Locale
+  so that filestore will compile against time 1.5.
+
 Version 0.6.0.5 released 2 April 2014
 
 * Mark post-update as a bash script (not a generic shell script).
-  Closes Debian #72323.
 
 * Bump version bounds for dependencies.
 
diff --git a/Data/FileStore/Compat/Locale.hs b/Data/FileStore/Compat/Locale.hs
new file mode 100644
--- /dev/null
+++ b/Data/FileStore/Compat/Locale.hs
@@ -0,0 +1,9 @@
+{-# LANGUAGE CPP #-}
+module Data.FileStore.Compat.Locale ( defaultTimeLocale )
+       where
+
+#if MIN_VERSION_time(1,5,0)
+import Data.Time.Format ( defaultTimeLocale )
+#else
+import System.Locale ( defaultTimeLocale )
+#endif
diff --git a/Data/FileStore/Darcs.hs b/Data/FileStore/Darcs.hs
--- a/Data/FileStore/Darcs.hs
+++ b/Data/FileStore/Darcs.hs
@@ -17,7 +17,7 @@
 import Control.Exception (throwIO)
 import Control.Monad (when)
 import Data.Time (formatTime)
-import System.Locale (defaultTimeLocale)
+import Data.FileStore.Compat.Locale (defaultTimeLocale)
 import Data.List (sort, isPrefixOf)
 #ifdef USE_MAXCOUNT
 import Data.List (isInfixOf)
diff --git a/Data/FileStore/DarcsXml.hs b/Data/FileStore/DarcsXml.hs
--- a/Data/FileStore/DarcsXml.hs
+++ b/Data/FileStore/DarcsXml.hs
@@ -3,7 +3,7 @@
 import Data.Maybe (catMaybes, fromMaybe)
 import Data.Char (isSpace)
 import Data.Time.Format (parseTime)
-import System.Locale (defaultTimeLocale)
+import Data.FileStore.Compat.Locale (defaultTimeLocale)
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
 import Text.XML.Light
 
diff --git a/Data/FileStore/Mercurial.hs b/Data/FileStore/Mercurial.hs
--- a/Data/FileStore/Mercurial.hs
+++ b/Data/FileStore/Mercurial.hs
@@ -29,7 +29,7 @@
 import System.FilePath ((</>), splitDirectories, takeFileName)
 import System.Directory (createDirectoryIfMissing, doesDirectoryExist)
 import Control.Exception (throwIO)
-import System.Locale (defaultTimeLocale)
+import Data.FileStore.Compat.Locale (defaultTimeLocale)
 import Data.Time (parseTime, formatTime)
 
 -- | Return a filestore implemented using the mercurial distributed revision control system
diff --git a/filestore.cabal b/filestore.cabal
--- a/filestore.cabal
+++ b/filestore.cabal
@@ -1,5 +1,5 @@
 Name:                filestore
-Version:             0.6.0.5
+Version:             0.6.0.6
 Cabal-Version:       >= 1.10
 Build-type:          Custom
 Synopsis:            Interface for versioning file stores.
@@ -32,7 +32,7 @@
                          bytestring >= 0.9 && < 1.0,
                          containers >= 0.3 && < 0.6,
                          utf8-string >= 0.3 && < 1.1,
-                         filepath >= 1.1 && < 1.4,
+                         filepath >= 1.1 && < 1.5,
                          directory >= 1.0 && < 1.3,
                          parsec >= 2 && < 3.2,
                          process >= 1.0 && < 1.3,
@@ -47,7 +47,8 @@
                          Data.FileStore.Utils, Data.FileStore.Generic
     Other-modules:       Paths_filestore,
                          Data.FileStore.DarcsXml,
-                         Data.FileStore.MercurialCommandServer
+                         Data.FileStore.MercurialCommandServer,
+                         Data.FileStore.Compat.Locale
     Default-Extensions:  FlexibleInstances, CPP
     Default-Language:    Haskell98
     if flag(maxcount)