diff --git a/Cabal2Ebuild.hs b/Cabal2Ebuild.hs
--- a/Cabal2Ebuild.hs
+++ b/Cabal2Ebuild.hs
@@ -110,16 +110,16 @@
   ,"ghc-prim"
   ,"haskell98"
   ,"hpc"          --has ebuild, but only in the overlay
-  ,"integer"
+  ,"integer"      -- up to ghc-6.10
+  ,"integer-gmp"  -- ghc-6.12+
   ,"old-locale"
   ,"old-time"
   ,"packedstring"
   ,"pretty"
   ,"process"
-  ,"random"
-  ,"readline"     --has ebuild, but only in the overlay
+  -- ,"random"    -- not a core package since ghc-7.2
   ,"rts"
   -- ,"syb"       -- was splitted off from ghc again
   ,"template-haskell"
-  ,"unix"         --has ebuild, but only in the overlay
+  ,"unix"         -- unsafe to upgrade
   ]
diff --git a/Portage/EBuild.hs b/Portage/EBuild.hs
--- a/Portage/EBuild.hs
+++ b/Portage/EBuild.hs
@@ -80,7 +80,7 @@
   nl.
   ss ("# ebuild generated by hackport " ++ hackportVersion ebuild). nl.
   nl.
-  ss "EAPI=\"3\"". nl.
+  ss "EAPI=4". nl.
   nl.
   ss "CABAL_FEATURES=". quote' (sepBy " " $ features ebuild). nl.
   ss "inherit haskell-cabal". nl.
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,7 @@
 
     $ mkdir ~/overlays
     $ cd ~/overlays
-    $ git clone git clone git://github.com/gentoo-haskell/gentoo-haskell.git
+    $ git clone git://github.com/gentoo-haskell/gentoo-haskell.git
     $ cd gentoo-haskell
     $ hackport update
     $ ls -1 .hackport/
diff --git a/cabal/cabal-install/Distribution/Client/Tar.hs b/cabal/cabal-install/Distribution/Client/Tar.hs
--- a/cabal/cabal-install/Distribution/Client/Tar.hs
+++ b/cabal/cabal-install/Distribution/Client/Tar.hs
@@ -743,7 +743,7 @@
 putString n s = take n s ++ fill (n - length s) '\NUL'
 
 --TODO: check integer widths, eg for large file sizes
-putOct :: Integral a => FieldWidth -> a -> String
+putOct :: (Integral a, Show a) => FieldWidth -> a -> String
 putOct n x =
   let octStr = take (n-1) $ showOct x ""
    in fill (n - length octStr - 1) '0'
diff --git a/hackport.cabal b/hackport.cabal
--- a/hackport.cabal
+++ b/hackport.cabal
@@ -1,5 +1,5 @@
 Name:           hackport
-Version:	0.2.14
+Version:	0.2.15
 License:	GPL
 License-file:   LICENSE
 Author:		Henning Günther, Duncan Coutts, Lennart Kolmodin