diff --git a/library/Rebase/Data/Hashable/Time.hs b/library/Rebase/Data/Hashable/Time.hs
deleted file mode 100644
--- a/library/Rebase/Data/Hashable/Time.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Rebase.Data.Hashable.Time
-(
-  module Data.Hashable.Time
-)
-where
-
-import Data.Hashable.Time
diff --git a/library/Rebase/Data/Time/Compat.hs b/library/Rebase/Data/Time/Compat.hs
new file mode 100644
--- /dev/null
+++ b/library/Rebase/Data/Time/Compat.hs
@@ -0,0 +1,7 @@
+module Rebase.Data.Time.Compat
+(
+  module Data.Time.Compat
+)
+where
+
+import Data.Time.Compat
diff --git a/library/Rebase/Prelude.hs b/library/Rebase/Prelude.hs
--- a/library/Rebase/Prelude.hs
+++ b/library/Rebase/Prelude.hs
@@ -226,9 +226,9 @@
 import Rebase.Data.Time.Clock.POSIX as Exports
 import Rebase.Data.Time.Clock.System as Exports
 
--- hashable-time
+-- time-compat
 -------------------------
-import Rebase.Data.Hashable.Time as Exports ()
+import Rebase.Data.Time.Compat as Exports ()
 
 -- stm
 -------------------------
diff --git a/rebase.cabal b/rebase.cabal
--- a/rebase.cabal
+++ b/rebase.cabal
@@ -1,5 +1,5 @@
 name: rebase
-version: 1.14
+version: 1.15
 synopsis: A more progressive alternative to the "base" package
 description:
   This package is intended for those who are tired of keeping
@@ -43,6 +43,7 @@
     Rebase.Control.Applicative.Lift
     Rebase.Control.Arrow
     Rebase.Control.Category
+    Rebase.Control.Comonad
     Rebase.Control.Concurrent
     Rebase.Control.Concurrent.Chan
     Rebase.Control.Concurrent.MVar
@@ -56,7 +57,6 @@
     Rebase.Control.Concurrent.STM.TQueue
     Rebase.Control.Concurrent.STM.TSem
     Rebase.Control.Concurrent.STM.TVar
-    Rebase.Control.Comonad
     Rebase.Control.DeepSeq
     Rebase.Control.Exception
     Rebase.Control.Exception.Base
@@ -182,7 +182,6 @@
     Rebase.Data.Group
     Rebase.Data.Groupoid
     Rebase.Data.Hashable
-    Rebase.Data.Hashable.Time
     Rebase.Data.HashMap.Lazy
     Rebase.Data.HashMap.Strict
     Rebase.Data.HashSet
@@ -268,6 +267,7 @@
     Rebase.Data.Time.Clock.POSIX
     Rebase.Data.Time.Clock.System
     Rebase.Data.Time.Clock.TAI
+    Rebase.Data.Time.Compat
     Rebase.Data.Time.Format
     Rebase.Data.Time.LocalTime
     Rebase.Data.Traversable
@@ -432,7 +432,6 @@
     either >=5 && <5.1,
     groups >=0.5.3 && <0.6,
     hashable >=1.3 && <1.5,
-    hashable-time >=0.2.0.2 && <0.4,
     invariant >=0.5.5 && <0.6,
     mtl >=2.2 && <2.3,
     profunctors >=5.6 && <5.7,
@@ -440,8 +439,9 @@
     selective >=0.5 && <0.6,
     semigroupoids >=5.3 && <5.4,
     stm >=2.5 && <2.6,
-    text >=1.2 && <1.3,
+    text >=1.2 && <1.3 || >=2.0 && <2.1,
     time >=1.9 && <1.12,
+    time-compat >=1.9.6.1 && <1.10,
     transformers >=0.5 && <0.6,
     unordered-containers >=0.2.13 && <0.3,
     uuid-types >=1.0 && <1.1,