diff --git a/Distribution/Gentoo/PkgManager.hs b/Distribution/Gentoo/PkgManager.hs
--- a/Distribution/Gentoo/PkgManager.hs
+++ b/Distribution/Gentoo/PkgManager.hs
@@ -25,8 +25,7 @@
 import Data.Maybe(mapMaybe, fromMaybe)
 import qualified Data.Map as M
 import Data.Map(Map)
-import System.IO.Error(try)
-import System.Environment(getEnv)
+import System.Environment(getEnvironment)
 
 -- -----------------------------------------------------------------------------
 
@@ -43,8 +42,8 @@
 --   "portage".  Note that even if that environment variable is
 --   defined, if it is unknown then it won't be used.
 defaultPM :: IO PkgManager
-defaultPM = do eDPM <- try $ getEnv "PACKAGE_MANAGER"
-               let dPM = either (const defaultPMName) id eDPM
+defaultPM = do eDPM <- lookup "PACKAGE_MANAGER" `fmap` getEnvironment
+               let dPM = maybe defaultPMName id eDPM
                    mPM = dPM `M.lookup` pmNameMap
                return $ fromMaybe knownDef mPM
   where
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.6
+Version:             1.2.0.7
 Synopsis:            Rebuild Haskell dependencies in Gentoo
 Description:         haskell-updater rebuilds Haskell packages on Gentoo
                      after a GHC upgrade or a dependency upgrade.
@@ -11,7 +11,7 @@
 
                      This version is for: GHC-6.12 + Cabal-1.8,
                      GHC-7.0 + Cabal-1.10, GHC-7.2 + Cabal-1.12,
-                     GHC-7.4 + Cabal-1.14.
+                     GHC-7.4 + Cabal-1.14, GHC-7.6 + Cabal-1.16.
 Category:            Distribution
 License:             GPL
 License-file:        COPYRIGHT
@@ -45,10 +45,10 @@
     Ghc-Prof-Options:   -auto-all
 
     Build-Depends:      base == 4.*,
-                        Cabal >= 1.8 && < 1.15,
-                        containers < 0.5,
+                        Cabal >= 1.8 && < 1.17,
+                        containers < 0.6,
                         filepath   < 1.4,
-                        directory  < 1.2,
+                        directory  < 1.3,
                         bytestring < 1.0,
                         process    < 1.2
 }