diff --git a/HStringTemplate.cabal b/HStringTemplate.cabal
--- a/HStringTemplate.cabal
+++ b/HStringTemplate.cabal
@@ -1,5 +1,5 @@
 name:                HStringTemplate
-version:             0.7.3
+version:             0.8
 synopsis:            StringTemplate implementation in Haskell.
 description:         A port of the Java library by Terrence Parr.
 category:            Text
@@ -7,7 +7,7 @@
 license-file:        LICENSE
 author:              Sterling Clover
 maintainer:          s.clover@gmail.com
-Tested-With:         GHC == 7.0.4
+Tested-With:         GHC == 7.8.3
 Build-Type:          Simple
 build-Depends:       base
 Cabal-Version:       >= 1.6
@@ -16,7 +16,7 @@
 library
 
   build-depends:   syb, base >= 4, base < 5, filepath, parsec < 4, containers, pretty >= 1.1.0.0,
-                   time, old-time, old-locale, bytestring, directory, array, text, deepseq, utf8-string, blaze-builder, void, template-haskell >= 2.3, mtl
+                   time >= 1.5 && < 1.6, bytestring, directory, array, text, deepseq, utf8-string, blaze-builder, void, template-haskell >= 2.3, mtl
 
   exposed-modules:   Text.StringTemplate
                      Text.StringTemplate.Base
@@ -30,4 +30,4 @@
 
 source-repository head
   type:     darcs
-  location: http://patch-tag.com/r/sclv/hstringtemplate
+  location: http://hub.darcs.net/sterlingclover/hstringtemplate
diff --git a/Text/StringTemplate/Group.hs b/Text/StringTemplate/Group.hs
--- a/Text/StringTemplate/Group.hs
+++ b/Text/StringTemplate/Group.hs
@@ -15,7 +15,6 @@
 import Control.Monad
 import Data.Monoid
 import Data.List
-import System.Time
 import System.FilePath
 import System.Directory
 import Data.IORef
@@ -23,6 +22,7 @@
 import System.IO.Error
 import System.IO.UTF8 as U
 import qualified Data.Map as M
+import Data.Time
 
 import Text.StringTemplate.Base
 import Text.StringTemplate.Classes
@@ -161,7 +161,7 @@
                              !ior <- newIORef M.empty
                              return $ \s -> unsafePerformIO $ do
                                mp  <- readIORef ior
-                               curtime <- getClockTime
+                               curtime <- getCurrentTime
                                let udReturn now = do
                                        let st = g s
                                        atomicModifyIORef ior $
@@ -170,7 +170,7 @@
                                case M.lookup s mp of
                                  Nothing -> udReturn curtime
                                  Just (t, st) ->
-                                     if (tdSec . normalizeTimeDiff $
-                                               diffClockTimes curtime t) > m
+                                     if (round . realToFrac $
+                                               diffUTCTime curtime t) > m
                                        then udReturn curtime
                                        else return st
diff --git a/Text/StringTemplate/Instances.hs b/Text/StringTemplate/Instances.hs
--- a/Text/StringTemplate/Instances.hs
+++ b/Text/StringTemplate/Instances.hs
@@ -13,8 +13,6 @@
 import Data.Array
 import Data.Maybe
 import qualified Data.Foldable as F
-import qualified System.Time as OldTime
-import System.Locale
 import Data.Time
 import Data.Void
 import qualified Data.Text as T
@@ -94,17 +92,6 @@
     toSElem = STR . show
 
 --Dates and Times
-instance StringTemplateShows OldTime.CalendarTime where
-    stringTemplateShow = OldTime.calendarTimeToString
-    stringTemplateFormattedShow = OldTime.formatCalendarTime defaultTimeLocale
-instance ToSElem OldTime.CalendarTime where
-    toSElem = stShowsToSE
-
-instance StringTemplateShows OldTime.TimeDiff where
-    stringTemplateShow = OldTime.timeDiffToString
-    stringTemplateFormattedShow = OldTime.formatTimeDiff defaultTimeLocale
-instance ToSElem OldTime.TimeDiff where
-    toSElem = stShowsToSE
 
 instance StringTemplateShows Day where
     stringTemplateShow = show