diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -4,4 +4,4 @@
 
 
 main :: IO ()
-main = defaultMainWithHooks defaultUserHooks
+main = defaultMain
diff --git a/Text/XML/Light/Output.hs b/Text/XML/Light/Output.hs
--- a/Text/XML/Light/Output.hs
+++ b/Text/XML/Light/Output.hs
@@ -175,11 +175,10 @@
   -- rendering ' in xhtml.
   -- Reported by Rohan Drape <rohan.drape@gmail.com>.
   '\''  -> showString "&#39;"
-  -- XXX: Is this really wortherd?
-  -- We could deal with these issues when we convert characters to bytes.
+
   -- NOTE: We escape '\r' explicitly because otherwise they get lost
   -- when parsed back in because of then end-of-line normalization rules.
-  _ | (oc <= 0x7f && isPrint c) || c == '\n' -> showChar c
+  _ | isPrint c || c == '\n' -> showChar c
     | otherwise -> showString "&#" . shows oc . showChar ';'
       where oc = ord c
 
diff --git a/xml.cabal b/xml.cabal
--- a/xml.cabal
+++ b/xml.cabal
@@ -1,5 +1,5 @@
 Name:            xml
-Version:         1.3.10
+Version:         1.3.11
 Homepage:        http://code.galois.com
 Synopsis:        A simple XML library.
 Description:     A simple XML library.
@@ -9,14 +9,23 @@
 Author:          Galois Inc.
 Maintainer:      diatchki@galois.com
 Copyright:       (c) 2007-2008 Galois Inc.
-Build-depends:   base >= 3 && < 5, bytestring, text
-Ghc-options:     -Wall -O2
-Exposed-modules: Text.XML.Light,
-                 Text.XML.Light.Types,
-                 Text.XML.Light.Output,
-                 Text.XML.Light.Input,
-                 Text.XML.Light.Lexer,
-                 Text.XML.Light.Proc
-                 Text.XML.Light.Cursor
-Extensions:      FlexibleInstances
 Build-type:      Simple
+Cabal-version:   >= 1.6
+
+
+library
+  Build-depends:   base >= 3 && < 5, bytestring, text
+  Ghc-options:     -Wall -O2
+  Exposed-modules: Text.XML.Light,
+                   Text.XML.Light.Types,
+                   Text.XML.Light.Output,
+                   Text.XML.Light.Input,
+                   Text.XML.Light.Lexer,
+                   Text.XML.Light.Proc
+                   Text.XML.Light.Cursor
+  Extensions:      FlexibleInstances
+
+source-repository head
+  type:       git
+  location:   git://code.galois.com/xml.git
+