diff --git a/Distribution/Gentoo/PkgManager.hs b/Distribution/Gentoo/PkgManager.hs
--- a/Distribution/Gentoo/PkgManager.hs
+++ b/Distribution/Gentoo/PkgManager.hs
@@ -36,8 +36,6 @@
 data PkgManager = Portage
                 | PkgCore
                 | Paludis
-                | Cave -- alternate package manager that comes with
-                       -- paludis; will eventually replace paludis
                 | InvalidPM String
                 | CustomPM String
                   deriving (Eq, Ord, Show, Read)
@@ -73,7 +71,6 @@
 pmNameMap = M.fromList [ ("portage", Portage)
                        , ("pkgcore", PkgCore)
                        , ("paludis", Paludis)
-                       , ("cave",    Cave)
                        ]
 
 pmNameMap' :: Map PkgManager String
@@ -97,20 +94,14 @@
 pmCommand                :: PkgManager -> String
 pmCommand Portage        = "emerge"
 pmCommand PkgCore        = "pmerge"
-pmCommand Paludis        = "paludis"
-pmCommand Cave           = "cave"
+pmCommand Paludis        = "cave"
 pmCommand (CustomPM cmd) = cmd
 pmCommand (InvalidPM _)  = undefined
 
 defaultPMFlags               :: PkgManager -> [String]
 defaultPMFlags Portage       = ["--oneshot", "--keep-going"]
 defaultPMFlags PkgCore       = ["--deep", "--oneshot", "--ignore-failures"]
-defaultPMFlags Paludis       = [ "--install", "--preserve-world"
-                               , "--continue-on-failure if-independent"]
-                             -- Here, --execute will be overridden by
-                             -- --no-execute when the --pretend option
-                             -- is set.
-defaultPMFlags Cave          = [ "resolve", "--execute", "--preserve-world"
+defaultPMFlags Paludis       = [ "resolve", "--execute", "--preserve-world"
                                , "--continue-on-failure if-independent"]
 defaultPMFlags CustomPM{}    = []
 defaultPMFlags (InvalidPM _) = undefined
@@ -132,8 +123,7 @@
 flagRep               :: PkgManager -> PMFlag -> Maybe String
 flagRep Portage       = portagePMFlag
 flagRep PkgCore       = pkgcorePMFlag
-flagRep Paludis       = paludisPMFlag
-flagRep Cave          = cavePMFlag
+flagRep Paludis       = cavePMFlag
 flagRep CustomPM{}    = const Nothing -- Can't tell how flags would work.
 flagRep (InvalidPM _) = undefined
 
@@ -145,11 +135,6 @@
 pkgcorePMFlag :: PMFlag -> Maybe String
 pkgcorePMFlag = portagePMFlag -- The options are the same for the 3
                               -- current flags.
-
-paludisPMFlag                :: PMFlag -> Maybe String
-paludisPMFlag PretendBuild   = Just "--pretend"
-paludisPMFlag UpdateDeep     = Just "--dl-upgrade always"
-paludisPMFlag UpdateAsNeeded = Just "--dl-upgrade as-needed --dl-new-slots as-needed"
 
 cavePMFlag                :: PMFlag -> Maybe String
 cavePMFlag PretendBuild   = Just "--no-execute"
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.1.3.0
+Version:             1.2.0.0
 Synopsis:            Rebuild Haskell dependencies in Gentoo
 Description:         haskell-updater rebuilds Haskell packages on Gentoo
                      after a GHC upgrade or a dependency upgrade.
@@ -9,7 +9,8 @@
                      GHC's boot libraries so as to have no external
                      dependencies.
 
-                     This version is for GHC-6.12 with Cabal-1.8.
+                     This version is for GHC-6.12 with Cabal-1.8 and
+                     GHC-7.0 with Cabal-1.0.
 Category:            Distribution
 License:             GPL
 License-file:        COPYRIGHT
@@ -21,7 +22,7 @@
                      Lennart Kolmodin,
                      Stephan Friedrichs,
                      Emil Karlson
-Maintainer:          Ivan.Miljenovic@gmail.com
+Maintainer:          haskell@gentoo.org
 Cabal-Version:       >= 1.6
 Build-Type:          Simple
 Extra-Source-Files:  TODO
@@ -42,10 +43,10 @@
     Ghc-Prof-Options:   -auto-all
 
     Build-Depends:      base == 4.*,
-                        Cabal == 1.8.*,
-                        containers < 0.4,
-                        filepath   < 1.2,
-                        directory  < 1.1,
+                        Cabal >= 1.8 && < 1.11,
+                        containers < 0.5,
+                        filepath   < 1.3,
+                        directory  < 1.2,
                         bytestring < 1.0,
                         process    < 1.1
 }