diff --git a/encoding.cabal b/encoding.cabal
index 384c1a2..b1e9c6e 100644
--- a/encoding.cabal
+++ b/encoding.cabal
@@ -22,8 +22,6 @@ Extra-Source-Files:
   system_encoding.h
   system_encoding.c
 
-Flag splitBase
-  description:	Choose the new smaller, split-up base package.
 Flag systemEncoding
   description: Provide the getSystemEncoding action to query the locale.
 
@@ -36,14 +34,24 @@ Source-Repository this
   Location:		http://code.haskell.org/encoding
   Tag:			0.8.1
 
+Custom-Setup
+  Setup-Depends: base >=3 && <5,
+                 Cabal,
+                 containers,
+                 filepath,
+                 ghc-prim,
+                 HaXml >=1.22 && <1.26
+
 Library
-  Build-Depends:	binary < 0.8, extensible-exceptions, HaXml >= 1.22 && < 1.26
-  if flag(splitBase)
-    Build-Depends:	bytestring, base >= 3 && < 5, mtl, containers, array, regex-compat
-    if impl(ghc >= 6.10)
-      Build-Depends:	ghc-prim
-  else
-    Build-Depends:	base < 3
+  Build-Depends: array,
+                 base >=3 && <5,
+                 binary < 0.8,
+                 bytestring,
+                 containers,
+                 extensible-exceptions,
+                 ghc-prim,
+                 mtl,
+                 regex-compat
 
   Extensions: CPP