diff --git a/src/compiler/GF/Compile.hs b/src/compiler/GF/Compile.hs
index 9b71c0f39..84aa3d7d9 100644
--- a/src/compiler/GF/Compile.hs
+++ b/src/compiler/GF/Compile.hs
@@ -27,7 +27,7 @@ import GF.Data.Operations
 
 import Control.Monad
 import System.IO
-import System.Directory
+import GF.System.Directory
 import System.FilePath
 import qualified Data.Map as Map
 --import qualified Data.Set as Set
diff --git a/src/compiler/GF/System/Directory.hs b/src/compiler/GF/System/Directory.hs
new file mode 100644
index 000000000..3ee1f3550
--- /dev/null
+++ b/src/compiler/GF/System/Directory.hs
@@ -0,0 +1,7 @@
+-- | Isolate backwards incompatible library changes to 'getModificationTime'
+module GF.System.Directory(getModificationTime,module D) where
+import qualified System.Directory as D
+import System.Directory as D hiding (getModificationTime)
+import Data.Time.Compat
+
+getModificationTime path = fmap toUTCTime (D.getModificationTime path)
diff --git a/src/compiler/GFServer.hs b/src/compiler/GFServer.hs
index 98bb3b74e..0df8a19f2 100644
--- a/src/compiler/GFServer.hs
+++ b/src/compiler/GFServer.hs
@@ -10,11 +10,10 @@ import System.Random(randomRIO)
 import System.IO(stderr,hPutStrLn)
 import GF.System.Catch(try)
 import System.IO.Error(isAlreadyExistsError)
-import System.Directory(doesDirectoryExist,doesFileExist,createDirectory,
-                        setCurrentDirectory,getCurrentDirectory,
-                        getDirectoryContents,removeFile,removeDirectory,
-                        getModificationTime)
-import Data.Time.Compat (toUTCTime)
+import GF.System.Directory(doesDirectoryExist,doesFileExist,createDirectory,
+                           setCurrentDirectory,getCurrentDirectory,
+                           getDirectoryContents,removeFile,removeDirectory,
+                           getModificationTime)
 import Data.Time (formatTime)
 import System.Locale(defaultTimeLocale,rfc822DateFormat)
 import System.FilePath(dropExtension,takeExtension,takeFileName,takeDirectory,