diff --git a/classify.cabal b/classify.cabal
--- a/classify.cabal
+++ b/classify.cabal
@@ -1,13 +1,13 @@
 Name:           classify
-Version:        2008.10.19
+Version:        2008.10.20
 Copyright:      2004-2008, Lemmih
-Build-Depends:  base, mtl, containers, old-time
+Build-Depends:  base, mtl, containers, time
 Build-Type:     Simple
 License:        BSD3
 Author:         Lemmih <lemmih@gmail.com>
 Maintainer:     Lemmih <lemmih@gmail.com>
 Synopsis:       Library for classification of media files.
-Category:       Tool
+Category:       Data
 HS-Source-Dirs: src
 Exposed-Modules:
   Data.Classify.DataTypes,
diff --git a/src/Data/Classify/Parser.hs b/src/Data/Classify/Parser.hs
--- a/src/Data/Classify/Parser.hs
+++ b/src/Data/Classify/Parser.hs
@@ -12,7 +12,7 @@
 import Data.Ord
 import Control.Monad
 --import Utils
-import System.Time
+--import System.Time
 import System.IO.Unsafe
 
 import qualified Data.Map as Map
@@ -51,14 +51,15 @@
            $ flip map (readP_to_S readp inp) $ \(a,str)
              -> return a
 
-currentYear = ctYear (unsafePerformIO (toCalendarTime =<< getClockTime))
 
 parseYear = choice
-            [ do string (show currentYear)
-                 return (currentYear, 2)
-            , do string (drop 2 (show currentYear))
-                 return (currentYear, 0)
-            ]
+            [ choice
+              [ do string (show year)
+                   return (year, 2)
+              , do string (drop 2 (show year))
+                   return (year, 0)
+              ]
+              | year <- [2001..2015]] -- Try years from 2001 to 2015
 
 getDigits n
     = do ds <- many1 digit
diff --git a/src/Data/Classify/Rank.hs b/src/Data/Classify/Rank.hs
--- a/src/Data/Classify/Rank.hs
+++ b/src/Data/Classify/Rank.hs
@@ -72,13 +72,31 @@
            , ("hidden.palms.0109-yestv.[VTV].avi", palms, Version 1 9)
            , ("hidden.palms.0110-yestv.[VTV].avi", palms, Version 1 10)
            , ("hidden.palms.0111-yestv.[VTV].avi", palms, Version 1 11)
+           , ("hidden.palms.0112-yestv.[VTV].mkv", palms, Version 1 12)
+           , ("the.colbert.report.06.28.01.dsr.xvid-sys.[VTV].avi", colbert, DateVersion 2001 6 28)
+           , ("the.colbert.report.06.28.15.dsr.xvid-sys.[VTV].avi", colbert, DateVersion 2015 6 28)
            , ("the.colbert.report.06.28.07.dsr.xvid-sys.[VTV].avi", colbert, DateVersion 2007 6 28)
            , ("the.colbert.report.07.26.07.dsr.xvid-crimson.[VTV].avi", colbert, DateVersion 2007 7 26)
            , ("the.colbert.report.07.25.07.dsr.xvid-stfu.[VTV].avi", colbert, DateVersion 2007 7 25)
            , ("the.colbert.report.09.12.07.dsr.xvid-crimson.[VTV].avi", colbert, DateVersion 2007 9 12)
            , ("the.colbert.report.09.13.07.dsr.xvid-crimson.[VTV].avi", colbert, DateVersion 2007 9 13)
+           , ("the.colbert.report.09.13.08.dsr.xvid-crimson.[VTV].avi", colbert, DateVersion 2008 9 13)
+           , ("the.colbert.report.09.13.09.dsr.xvid-crimson.[VTV].avi", colbert, DateVersion 2009 9 13)
            , ("the.colbert.report.9.19.07.dsr.xvid.iht.[VTV].avi", colbert, DateVersion 2007 9 19)
            , ("the.daily.show.9.19.07.dsr.xvid.iht.[VTV].avi", daily, DateVersion 2007 9 19)
+
+           , ("Time.Warp.S01E02.HDTV.XviD-GNARLY.avi", "Time Warp", Version 1 2)
+           , ("True.Blood.S01E07.720p.HDTV.x264-2HD.mkv", "True Blood", Version 1 7)
+           , ("Family.Guy.S07E03.PDTV.XviD-LOL.avi", "Family Guy", Version 7 3)
+           , ("Dexter.S03E02.720p.HDTV.x264-SYS.mkv", "Dexter", Version 3 2)
+           , ("Greys.Anatomy.S05E04.720p.HDTV.X264-DIMENSION.mkv", "Greys Anatomy", Version 5 4)
+           , ("Life.S02E05.HDTV.XviD-LOL.[VTV].avi", "Life", Version 2 5)
+           , ("Merlin.2008.S01E05.WS.PDTV.XviD-BiA.avi", "Merlin", Version 1 5)
+           , ("South.Park.S12E09.DSR.XviD-0TV.avi", "South Park", Version 12 9)
+           , ("Stargate.Atlantis.S05E12.720p.HDTV.x264-CTU.mkv", "Stargate Atlantis", Version 5 12)
+           , ("Heroes.S03E05.HDTV.XviD-LOL.avi", "Heroes", Version 3 5)
+           , ("Californication.S02E04.720p.HDTV.X264-DIMENSION.mkv", "Californication", Version 2 4)
+           , ("Psych - 1x09 - Forget Me Not.avi", "Psych", Version 1 9)
            ]
 
 runTests = flip mapM_ testData $ \(str, series, expectedVersion) ->