diff --git a/src/Codec/Binary/UTF8/Light.hs b/src/Codec/Binary/UTF8/Light.hs
--- a/src/Codec/Binary/UTF8/Light.hs
+++ b/src/Codec/Binary/UTF8/Light.hs
@@ -1,11 +1,10 @@
-{-# OPTIONS_GHC -O2 -fglasgow-exts -fvia-C -optc-O2 #-}
+{-# OPTIONS_GHC -O2 -fglasgow-exts -fvia-C -optc-O3 #-}
 {-# LANGUAGE CPP #-}
 
 {- |
   Module      :  Codec.Binary.UTF8.Light
   Copyright   :  (c) Matt Morrow 2008
   License     :  BSD3
-
   Maintainer  :  Matt Morrow <mjm2002@gmail.com>
   Stability   :  provisional
   Portability :  portable
@@ -15,10 +14,6 @@
 
 module Codec.Binary.UTF8.Light (
     UTF8(..)
-  , c2w
-  , w2c
-  , i2w
-  , w2i
   , lenUTF8
   , lenUTF16
   , countUTF8
@@ -37,6 +32,10 @@
   , hGetUTF8Contents
   , hGetUTF8
   , hGetUTF8NonBlocking
+  , c2w
+  , w2c
+  , i2w
+  , w2i
   , flipUTF8
   , unflipUTF8
   , flipTab
diff --git a/utf8-light.cabal b/utf8-light.cabal
--- a/utf8-light.cabal
+++ b/utf8-light.cabal
@@ -1,6 +1,6 @@
 name:               utf8-light
-version:            0.3
-cabal-version:      >= 1.3
+version:            0.4
+cabal-version:      >= 1.5
 build-type:         Simple
 license:            BSD3
 license-file:       LICENSE
@@ -8,23 +8,14 @@
 author:             Matt Morrow
 copyright:          Matt Morrow
 maintainer:         Matt Morrow <mjm2002@gmail.com>
-stability:          provisional
-synopsis:           utf8-light
-description:        Lightweight UTF8 handling. Haddock docs are at
-                    <http://code.haskell.org/~morrow/code/haskell/utf8-light/haddock/>.
+stability:          experimental
+synopsis:           Unicode
+description:        Lightweight UTF8 handling.
 
 library
-  build-depends:      base, bytestring
-  ghc-options:        -O2 -fglasgow-exts -fvia-C -optc-O2
+  build-depends:      base, ghc-prim, bytestring
+  ghc-options:        -O2 -fglasgow-exts -fvia-C -optc-O3
   extensions:         CPP
   hs-source-dirs:     src
   exposed-modules:    Codec.Binary.UTF8.Light
-
-executable utf8flip
-  executable:       utf8flip
-  main-is:          utf8flip.hs
-  build-depends:    base, bytestring
-  hs-source-dirs:   utils, src
-  ghc-options:      -O2 -fglasgow-exts -fvia-C -optc-O2
-
 
diff --git a/utils/utf8flip.hs b/utils/utf8flip.hs
deleted file mode 100644
--- a/utils/utf8flip.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-{-# OPTIONS_GHC -O2 #-}
-import Codec.Binary.UTF8.Light
-main :: IO ()
-main = putUTF8 . unlines
-        . reverse . fmap flipUTF8
-            . lines =<< getContents