diff --git a/CCMain.hs b/CCMain.hs
--- a/CCMain.hs
+++ b/CCMain.hs
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------------------
--- CleverCSS in Haskell, (c) 2007 Georg Brandl. Licensed under the BSD license.
+-- CleverCSS in Haskell, (c) 2007, 2008 Georg Brandl. Licensed under the BSD license.
 --
--- Main module: command-line interface.
+-- CCMain module: command-line interface.
 ------------------------------------------------------------------------------------------ 
 
 module Main (main) where
diff --git a/Text/CSS/CleverCSS.hs b/Text/CSS/CleverCSS.hs
--- a/Text/CSS/CleverCSS.hs
+++ b/Text/CSS/CleverCSS.hs
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------------------
--- CleverCSS in Haskell, (c) 2007 Georg Brandl. Licensed under the BSD license.
+-- CleverCSS in Haskell, (c) 2007, 2008 Georg Brandl. Licensed under the BSD license.
 --
--- CleverCSS module: main parsing and evaluation.
+-- Text.CSS.CleverCSS module: main parsing and evaluation.
 --
 -- TODO: properly parse selectors before splitting them
 ------------------------------------------------------------------------------------------ 
diff --git a/Text/CSS/CleverCSSUtil.hs b/Text/CSS/CleverCSSUtil.hs
--- a/Text/CSS/CleverCSSUtil.hs
+++ b/Text/CSS/CleverCSSUtil.hs
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------------------
--- CleverCSS in Haskell, (c) 2007 Georg Brandl. Licensed under the BSD license.
+-- CleverCSS in Haskell, (c) 2007, 2008 Georg Brandl. Licensed under the BSD license.
 --
--- CCUtil module: utilities.
+-- Text.CSS.CleverCSSUtil module: utilities.
 ------------------------------------------------------------------------------------------ 
 
 module Text.CSS.CleverCSSUtil (
@@ -286,7 +286,7 @@
 trim = ltrim . rtrim
 
 preprocess :: String -> String
-preprocess []        = ['\n']  -- be sure to have always a newline at the end
+preprocess []        = ['\n']  -- be sure to always have a newline at the end
 preprocess ('\t':xs) = ' ':' ':' ':' ':' ':' ':' ':' ' : preprocess xs
 preprocess ('\f':xs) = '\n' : preprocess xs
 preprocess ('\r':xs) = preprocess xs
diff --git a/clevercss.cabal b/clevercss.cabal
--- a/clevercss.cabal
+++ b/clevercss.cabal
@@ -1,5 +1,6 @@
+cabal-version: >=1.2
 Name: clevercss
-Version: 0.1
+Version: 0.1.1
 Category: Text
 Synopsis: A CSS preprocessor
 Description: CleverCSS is a CSS preprocessing library that allows defining variables and nesting selectors so that you don't need to Repeat Yourself.
@@ -9,13 +10,24 @@
 Maintainer: georg@python.org
 Homepage: http://sandbox.pocoo.org/clevercss-hs/
 Stability: experimental
-Build-Depends: base, parsec, mtl, haskell98
 Extra-Source-Files: documentation.html, example.ccs
-Extensions: PatternGuards
-GHC-Options: -O1 -funbox-strict-fields
-Exposed-Modules: Text.CSS.CleverCSS
-Other-Modules: Text.CSS.CleverCSSUtil
+Build-Type: Simple
 
-Executable: clevercss
-Main-is: CCMain.hs
+Flag splitBase
+  Description: Choose the new smaller, split-up base package.
+
+Library
+  If flag(splitBase)
+    Build-Depends: base >= 3, containers, parsec, mtl, haskell98
+  Else
+    Build-Depends: base < 3, parsec, mtl, haskell98
+  Exposed-Modules: Text.CSS.CleverCSS
+  Other-Modules: Text.CSS.CleverCSSUtil
+  Extensions: PatternGuards
+  GHC-Options: -funbox-strict-fields
+
+Executable clevercss
+  Main-is: CCMain.hs
+  Extensions: PatternGuards
+  GHC-Options: -funbox-strict-fields