diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,6 +1,2 @@
-#!/usr/bin/env runhaskell
-
--- I usually compile this with "ghc --make -o setup Setup.hs"
-
-import Distribution.Simple(defaultMain)
+import Distribution.Simple
 main = defaultMain
diff --git a/Text/Regex/Base.hs b/Text/Regex/Base.hs
--- a/Text/Regex/Base.hs
+++ b/Text/Regex/Base.hs
@@ -51,6 +51,6 @@
 
 getVersion_Text_Regex_Base :: Version
 getVersion_Text_Regex_Base =
-  Version { versionBranch = [0,93,1]
+  Version { versionBranch = [0,93,2]
           , versionTags = ["unstable"]
           }
diff --git a/Text/Regex/Base/Context.hs b/Text/Regex/Base/Context.hs
--- a/Text/Regex/Base/Context.hs
+++ b/Text/Regex/Base/Context.hs
@@ -188,7 +188,7 @@
 
 import Control.Monad(liftM)
 import Data.Array(Array,(!),elems,listArray)
-import Data.Maybe(maybe)
+--  import Data.Maybe(maybe)
 import Text.Regex.Base.RegexLike(RegexLike(..),RegexContext(..)
   ,AllSubmatches(..),AllTextSubmatches(..),AllMatches(..),AllTextMatches(..)
   ,MatchResult(..),Extract(empty),MatchOffset,MatchLength,MatchArray,MatchText)
diff --git a/regex-base.cabal b/regex-base.cabal
--- a/regex-base.cabal
+++ b/regex-base.cabal
@@ -1,6 +1,6 @@
 Name:                   regex-base
 -- Keep the version below in sync with ./Text/Regex/Base.hs value getVersion_Text_Regex_Base :: Version
-Version:                0.93.1
+Version:                0.93.2
 Cabal-Version:          >=1.2
 License:                BSD3
 License-File:           LICENSE
@@ -14,15 +14,24 @@
 Description:            Interface API for regex-posix,pcre,parsec,tdfa,dfa
 Category:               Text
 Tested-With:            GHC
+build-type:             Simple
+flag newBase
+  description: Choose base >= 4
+  default: True
 flag splitBase
   description: Choose the new smaller, split-up base package.
+  default: True
 library
-  if flag(splitBase)
-    Build-Depends:      base >= 3.0, mtl, containers, bytestring, array
+  if flag(newBase)
+    Build-Depends:      base >=4 && < 5, mtl, containers, bytestring, array
     Extensions:         MultiParamTypeClasses, FunctionalDependencies, TypeSynonymInstances, FlexibleInstances, FlexibleContexts
   else
-    Build-Depends:      base < 3.0, mtl
-    Extensions:         MultiParamTypeClasses, FunctionalDependencies
+    if flag(splitBase)
+      Build-Depends:      base >= 3.0, mtl, containers, bytestring, array
+      Extensions:         MultiParamTypeClasses, FunctionalDependencies, TypeSynonymInstances, FlexibleInstances, FlexibleContexts
+    else
+      Build-Depends:      base < 3.0, mtl
+      Extensions:         MultiParamTypeClasses, FunctionalDependencies
   -- Data-Files:
   -- Extra-Source-Files:
   -- Extra-Tmp-Files: