diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..21fa639cb6eb86222016591ce908600ecfc22591
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,26 @@
+# language: haskell
+
+# See http://www.reddit.com/r/haskell/comments/1os3f6/how_to_use_travisci_with_multiple_ghc_versions/
+
+env:
+ - GHCVER=7.6.3
+ - GHCVER=7.8.4
+ - GHCVER=7.10.3
+ - GHCVER=8.0.1
+
+before_install:
+ - sudo add-apt-repository -y ppa:hvr/ghc
+ - sudo apt-get update
+ - sudo apt-get install cabal-install-1.24 ghc-$GHCVER
+ - export PATH=/opt/ghc/$GHCVER/bin:$PATH
+
+install:
+ - cabal-1.24 update
+ - cabal-1.24 install --only-dependencies --enable-tests
+
+script:
+ - cabal-1.24 configure --enable-tests
+ - cabal-1.24 build
+ - cabal-1.24 check
+ - cabal-1.24 haddock
+ - cabal-1.24 sdist
diff --git a/README b/README
deleted file mode 100644
index 9f285978f1c2a7628b92c8e971f692861364cb50..0000000000000000000000000000000000000000
--- a/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This package provides combinators for producing XHTML 1.0, including
-the Strict, Transitional and Frameset variants.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..cb3b7571b4672421c31bf8b93b703269aaa521ec
--- /dev/null
+++ b/README.md
@@ -0,0 +1,7 @@
+XHTML
+-----
+
+[![Build Status](https://secure.travis-ci.org/haskell/xhtml.svg?branch=master)](http://travis-ci.org/haskell/xhtml)
+
+This package provides combinators for producing XHTML 1.0, including
+the Strict, Transitional and Frameset variants.
diff --git a/xhtml.cabal b/xhtml.cabal
index f31003e3185cba045c86a0bf59f3dba13327f235..42eb16f2d4b04297c6494443e683101f9a805948 100644
--- a/xhtml.cabal
+++ b/xhtml.cabal
@@ -20,10 +20,10 @@ Source-repository head
     type:           git
     location:       https://github.com/haskell/xhtml
 
-library 
+library
     Build-depends:  base >= 4.0 && < 5.0
-    Exposed-modules: 
-                    Text.XHtml, 
+    Exposed-modules:
+                    Text.XHtml,
                     Text.XHtml.Frameset,
                     Text.XHtml.Strict,
                     Text.XHtml.Transitional,
@@ -39,6 +39,6 @@ library
                     Text.XHtml.BlockTable,
                     Text.XHtml.Extras,
                     Text.XHtml.Internals
-    
-    ghc-options:    -Wall
+
+    ghc-options:    -Wall -fwarn-tabs
     Extensions:     CPP