diff --git a/Network/Download.hsc b/Network/Download.hsc
--- a/Network/Download.hsc
+++ b/Network/Download.hsc
@@ -41,11 +41,11 @@
 import Foreign.C.String
 
 import qualified Foreign.Concurrent as C
-import Control.Monad
-import Control.Monad.Instances
-import Data.Word
-import System.IO
-import System.IO.Unsafe
+-- import Control.Monad
+import Control.Monad.Instances ()
+-- import Data.Word
+-- import System.IO
+-- import System.IO.Unsafe
 import Control.Exception
 
 import qualified Data.ByteString.Internal as S
diff --git a/download.cabal b/download.cabal
--- a/download.cabal
+++ b/download.cabal
@@ -1,5 +1,5 @@
 name:            download
-version:         0.3.1.1
+version:         0.3.2
 homepage:        http://code.haskell.org/~dons/code/download
 synopsis:        High-level file download based on URLs
 description:     High-level file download based on URLs
@@ -38,20 +38,17 @@
 category:        Network
 license:         BSD3
 license-file:    LICENSE
-copyright:       (c) 2008, Don Stewart <dons@galois.com>
+copyright:       (c) 2008-2011, Don Stewart <dons00@gmail.com>
 author:          Don Stewart
-maintainer:      Don Stewart <dons@galois.com>
-cabal-version:   >= 1.6
+maintainer:      Don Stewart <dons00@gmail.com>
+cabal-version:   >= 1.2.0
 build-type:      Simple
-tested-with:     GHC ==6.8.2, GHC ==6.12.1
+tested-with:     GHC ==6.8.2, GHC ==6.12.1, GHC ==7.0.2
 
 -- flag external
 --  description: Build with an external libdownload
 --  default:     False
 
-flag small_base
-  description: Build with new smaller base library
-
 library
     exposed-modules: Network.Download
     extensions:      CPP,
@@ -61,10 +58,7 @@
 
     ghc-options:     -Wall
 
-    if flag(small_base)
-        build-depends:   base >= 3 && < 4, bytestring
-    else
-        build-depends:   base > 3 && < 5
+    build-depends:   base >= 3 && < 5, bytestring
 
     build-depends: tagsoup >= 0.8, feed, xml
 
@@ -81,7 +75,8 @@
 --        install-includes:   hs_download_utils.h
 --    else
 
-    cc-options:         -DINET6
+    cc-options:         -O2
+                        -DINET6
                         -D_GNU_SOURCE
                         -D_FILE_OFFSET_BITS=64
                         -UDEBUG
@@ -105,4 +100,4 @@
                         ftperr.h
                         httperr.h
                         hs_download_utils.h
-                                               
+