diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+# bencode
+
+[![travis][badge-travis]][travis]
+[![hackage][badge-hackage]][hackage]
+[![license][badge-license]][license]
+
+Haskell Parser and printer for bencoded data.
+
+Bencode (pronounced like B encode) is the encoding used by the
+peer-to-peer file sharing system BitTorrent for storing and
+transmitting loosely structured data.
+
+
+# Support
+
+- [Issue tracker][issues]
+
+
+
+[badge-travis]: https://travis-ci.org/creichert/bencode.svg?branch=master
+[travis]: https://travis-ci.org/creichert/bencode
+[badge-hackage]: https://img.shields.io/hackage/v/bencode.svg?dummy
+[hackage]: https://hackage.haskell.org/package/bencode
+[badge-license]: https://img.shields.io/badge/license-BSD3-green.svg?dummy
+[license]: https://github.com/creichert/bencode/blob/master/LICENSE
+[issues]: https://github.com/creichert/bencode/issues
diff --git a/Setup.lhs b/Setup.lhs
--- a/Setup.lhs
+++ b/Setup.lhs
@@ -1,5 +1,8 @@
 #!/usr/bin/env runhaskell
-> module Main where
+
+> module Main (main) where
+>
 > import Distribution.Simple
+>
 > main :: IO ()
-> main = defaultMainWithHooks defaultUserHooks
+> main = defaultMain
diff --git a/bencode.cabal b/bencode.cabal
--- a/bencode.cabal
+++ b/bencode.cabal
@@ -1,23 +1,24 @@
-name:          bencode
-version:       0.6.1.0
-synopsis:      Parsers and printers for bencoded data.
-description:   Parsers and printers for bencoded data. Bencode (pronounced like B encode)
-               is the encoding used by the peer-to-peer file sharing system BitTorrent for
-               storing and transmitting loosely structured data.
-license:       BSD3
-license-file:  LICENSE
-copyright:     (c) 2005-2009, David Himmelstrup,
-               (c) 2006 Lemmih <lemmih@gmail.com>,
-               (c) 2005 Jesper Louis Andersen <jlouis@mongers.org>
-author:        Lemmih <lemmih@gmail.com>,
-               Jesper Louis Andersen <jlouis@mongers.org>,
-               Christopher Reichert <creichert07@gmail.com>
-maintainer:    Peter Simons <simons@cryp.to>
-tested-with:   GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2,
-               GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.2
-category:      Text
-build-type:    Simple
-cabal-version: >= 1.10
+name:               bencode
+version:            0.6.1.1
+synopsis:           Parsers and printers for bencoded data.
+description:        Parsers and printers for bencoded data. Bencode (pronounced like B
+                    encode) is the encoding used by the peer-to-peer file sharing system
+                    BitTorrent for storing and transmitting loosely structured data.
+license:            BSD3
+license-file:       LICENSE
+copyright:          (c) 2005-2009, David Himmelstrup,
+                    (c) 2006 Lemmih <lemmih@gmail.com>,
+                    (c) 2005 Jesper Louis Andersen <jlouis@mongers.org>
+author:             Lemmih <lemmih@gmail.com>,
+                    Jesper Louis Andersen <jlouis@mongers.org>,
+                    Christopher Reichert <creichert07@gmail.com>
+maintainer:         Peter Simons <simons@cryp.to>
+tested-with:        GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2,
+                    GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.2
+category:           Text
+build-type:         Simple
+extra-source-files: README.md
+cabal-version:      >= 1.10
 
 source-repository head
   type:     git