diff --git a/Distribution/Gentoo/GHC.hs b/Distribution/Gentoo/GHC.hs
--- a/Distribution/Gentoo/GHC.hs
+++ b/Distribution/Gentoo/GHC.hs
@@ -141,7 +141,6 @@
              -> IO [Package]
 checkPkgs msg typ (pns,cnfs)
   = do putStrLn $ "Searching for " ++ msg ++ "."
-       -- (pns, cnfs) <- brokenConfs
        unless (null pns)
                   $ unknownPackages pns
        (nI, pkgs) <- liftM partitionEithers $ mapM hasFile' cnfs
diff --git a/Distribution/Gentoo/Packages.hs b/Distribution/Gentoo/Packages.hs
--- a/Distribution/Gentoo/Packages.hs
+++ b/Distribution/Gentoo/Packages.hs
@@ -161,10 +161,12 @@
     -- how spaces are represented in file names.
     -- This might cause a problem if there is more than a single
     -- space (or a tab) in the filename...
+    -- Also require at least 3 words in case of an object, as the CONTENTS
+    -- file can be corrept (fixes an actual problem).
     parseCLine :: [ByteString] -> Maybe Content
     parseCLine (tp:ln)
       | tp == dir = Just . Dir . BS.unwords $ ln
-      | tp == obj = Just . Obj . BS.unwords $ dropLastTwo ln
+      | tp == obj && length ln >= 3 = Just . Obj . BS.unwords $ dropLastTwo ln
       | otherwise = Nothing
     parseCLine [] = Nothing
 
diff --git a/Main.hs b/Main.hs
--- a/Main.hs
+++ b/Main.hs
@@ -126,7 +126,7 @@
           | Upgrade
           | RebuildAll
           | Pretend
-	  | NoDeep
+          | NoDeep
           deriving (Eq, Ord, Show, Read)
 
 parseArgs :: IO (RunModifier, Action)
diff --git a/TODO b/TODO
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-* Allow user-defined PMs (in case they have custom scripts, etc.)
-
 * Have the option to spit out the PM command to be used instead of using it.
 
 * Pretty colours in output?
diff --git a/haskell-updater.cabal b/haskell-updater.cabal
--- a/haskell-updater.cabal
+++ b/haskell-updater.cabal
@@ -1,6 +1,6 @@
 Name:                haskell-updater
 Homepage:            http://haskell.org/haskellwiki/Gentoo#haskell-updater
-Version:             1.2.0.0
+Version:             1.2.0.1
 Synopsis:            Rebuild Haskell dependencies in Gentoo
 Description:         haskell-updater rebuilds Haskell packages on Gentoo
                      after a GHC upgrade or a dependency upgrade.
@@ -9,8 +9,8 @@
                      GHC's boot libraries so as to have no external
                      dependencies.
 
-                     This version is for GHC-6.12 with Cabal-1.8 and
-                     GHC-7.0 with Cabal-1.0.
+                     This version is for: GHC-6.12 + Cabal-1.8,
+                     GHC-7.0 + Cabal-1.10, GHC-7.2 + Cabal-1.12.
 Category:            Distribution
 License:             GPL
 License-file:        COPYRIGHT
@@ -43,10 +43,10 @@
     Ghc-Prof-Options:   -auto-all
 
     Build-Depends:      base == 4.*,
-                        Cabal >= 1.8 && < 1.11,
+                        Cabal >= 1.8 && < 1.13,
                         containers < 0.5,
                         filepath   < 1.3,
                         directory  < 1.2,
                         bytestring < 1.0,
-                        process    < 1.1
+                        process    < 1.2
 }