diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..3a4edf690ca5fd2213e31a83ede1503d5c73ccfa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.project
diff --git a/README b/README
new file mode 100644
index 0000000000000000000000000000000000000000..9f285978f1c2a7628b92c8e971f692861364cb50
--- /dev/null
+++ b/README
@@ -0,0 +1,2 @@
+This package provides combinators for producing XHTML 1.0, including
+the Strict, Transitional and Frameset variants.
diff --git a/Text/XHtml.hs b/Text/XHtml.hs
index d2afe780c02a2c0783bc61bb5fae74b712b51598..99b1cd2718f59da003a853805ee9f58120adb1d9 100644
--- a/Text/XHtml.hs
+++ b/Text/XHtml.hs
@@ -9,9 +9,9 @@
 --                Science and Technology, 1999-2001,
 --                (c) Bjorn Bringert, 2004-2006
 -- License     :  BSD-style (see the file LICENSE)
--- Maintainer  :  Bjorn Bringert <bjorn@bringert.net>
--- Stability   :  experimental
--- Portability :  portable
+-- Maintainer  :  Chris Dornan <chris@chrisdornan.com>
+-- Stability   :  Stable
+-- Portability :  Portable
 --
 -- An XHTML combinator library.
 --
diff --git a/Text/XHtml/BlockTable.hs b/Text/XHtml/BlockTable.hs
index 4defc72238adc5c0b6263902c468e9899a71b694..42718a881f7cb66c6389aba3c7c3ea50205943cc 100644
--- a/Text/XHtml/BlockTable.hs
+++ b/Text/XHtml/BlockTable.hs
@@ -8,9 +8,9 @@
 -- Copyright   :  (c) Andy Gill, and the Oregon Graduate Institute of 
 --                    Science and Technology, 1999-2001
 -- License     :  BSD-style (see the file LICENSE)
--- Maintainer  :  Bjorn Bringert <bjorn@bringert.net>
--- Stability   :  experimental
--- Portability :  portable
+-- Maintainer  :  Chris Dornan <chris@chrisdornan.com>
+-- Stability   :  Stable
+-- Portability :  Portable
 --
 -- An XHTML combinator library
 --
diff --git a/Text/XHtml/Internals.hs b/Text/XHtml/Internals.hs
index 66d0791f65c89260274d15335fa1bdf80921bc87..ed13e7d5d35e9c20c21041435bac6304dc22690f 100644
--- a/Text/XHtml/Internals.hs
+++ b/Text/XHtml/Internals.hs
@@ -11,9 +11,9 @@
 --                Science and Technology, 1999-2001,
 --                (c) Bjorn Bringert, 2004-2006
 -- License     :  BSD-style (see the file LICENSE)
--- Maintainer  :  Bjorn Bringert <bjorn@bringert.net>
--- Stability   :  experimental
--- Portability :  portable
+-- Maintainer  :  Chris Dornan <chris@chrisdornan.com>
+-- Stability   :  Stable
+-- Portability :  Portable
 --
 -- Internals of the XHTML combinator library.
 -----------------------------------------------------------------------------
diff --git a/xhtml.cabal b/xhtml.cabal
index e5b6fc4c46243b10239a5d23338369a392fa1a0f..0368a72b2caf5baf01998097d0aa5a670c6a480d 100644
--- a/xhtml.cabal
+++ b/xhtml.cabal
@@ -1,34 +1,44 @@
-Name: xhtml
-Version: 3000.2.0.1
-Copyright: Bjorn Bringert 2004-2006, Andy Gill, and the Oregon Graduate 
-           Institute of Science and Technology, 1999-2001
-Maintainer: bjorn@bringert.net
-Author: Bjorn Bringert
-License: BSD3
-License-file: LICENSE
-build-depends: base >= 4.0 && < 4.5
-Extensions: 
-Synopsis: An XHTML combinator library
-Description:
- This package provides combinators for producing
-  XHTML 1.0, including the Strict, Transitional and Frameset variants.
-Build-Type: Simple
-Exposed-Modules: 
-  Text.XHtml, 
-  Text.XHtml.Frameset,
-  Text.XHtml.Strict,
-  Text.XHtml.Transitional,
-  Text.XHtml.Debug,
-  Text.XHtml.Table
-Other-modules:
-  Text.XHtml.Strict.Attributes,
-  Text.XHtml.Strict.Elements,
-  Text.XHtml.Frameset.Attributes,
-  Text.XHtml.Frameset.Elements,
-  Text.XHtml.Transitional.Attributes,
-  Text.XHtml.Transitional.Elements,
-  Text.XHtml.BlockTable,
-  Text.XHtml.Extras,
-  Text.XHtml.Internals
-ghc-options: -O2 -W
-Extensions: CPP
+Name:               xhtml
+Version:            3000.2.0.3
+Copyright:          Bjorn Bringert 2004-2006, Andy Gill, and the Oregon Graduate 
+                    Institute of Science and Technology, 1999-2001
+Maintainer:         Chris Dornan <chris@chrisdornan.com>
+Author:             Bjorn Bringert
+License:            BSD3
+License-file:       LICENSE
+Build-depends:      base >= 4.0 && < 4.5
+Synopsis:           An XHTML combinator library
+Description:        This package provides combinators for producing
+                    XHTML 1.0, including the Strict, Transitional and
+                    Frameset variants.
+Stability:          Stable
+Category:           Web, XML, Pretty Printer
+Homepage:           https://github.com/haskell/xhtml
+Build-type:         Simple
+Cabal-version:      >= 1.6
+
+Source-repository head
+    type:           git
+    location:       git@github.com:haskell/xhtml.git
+
+library 
+    Exposed-modules: 
+                    Text.XHtml, 
+                    Text.XHtml.Frameset,
+                    Text.XHtml.Strict,
+                    Text.XHtml.Transitional,
+                    Text.XHtml.Debug,
+                    Text.XHtml.Table
+    Other-modules:
+                    Text.XHtml.Strict.Attributes,
+                    Text.XHtml.Strict.Elements,
+                    Text.XHtml.Frameset.Attributes,
+                    Text.XHtml.Frameset.Elements,
+                    Text.XHtml.Transitional.Attributes,
+                    Text.XHtml.Transitional.Elements,
+                    Text.XHtml.BlockTable,
+                    Text.XHtml.Extras,
+                    Text.XHtml.Internals
+    
+    ghc-options:    -Wall
+    Extensions:     CPP