diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,5 @@
+# happstack-static-routing-0.6.0.0  (2017-06-20)
+* No longer uses OverlappingInstances.
+
+# happstack-static-routing-0.1  (2011-12-13)
+* Initial release.
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,11 @@
+# happstack-static-routing [![Hackage version](https://img.shields.io/hackage/v/happstack-static-routing.svg?label=Hackage)](https://hackage.haskell.org/package/happstack-static-routing) [![Build Status](https://secure.travis-ci.org/scrive/happstack-static-routing.svg?branch=master)](http://travis-ci.org/scrive/happstack-static-routing)
+
+If you have a large routing table in Happstack and want to insert a
+new handler, you might run into overlap problems (ambiguity).  The new
+handler might not fire because it matches against a URL that is
+already handled earlier.  Or if you put your new handler first, it
+might steal requests from existing handlers.
+
+This Happstack support library allows you to detect overlap cases and
+build unambiguous routing tables where the order of the handlers is
+irrelevant.
diff --git a/happstack-static-routing.cabal b/happstack-static-routing.cabal
--- a/happstack-static-routing.cabal
+++ b/happstack-static-routing.cabal
@@ -1,5 +1,5 @@
 Name:                happstack-static-routing
-Version:             0.4.2
+Version:             0.6.0.0
 Synopsis: Support for static URL routing with overlap detection for Happstack.
 
 Description: If you have a large routing table in Happstack and want
@@ -14,14 +14,22 @@
 
 License:             BSD3
 License-file:        LICENSE
-Author:              Scrive
-Maintainer:          gracjan@scrive.com
+Author:              Scrive AB
+Maintainer:          Gracjan Polak <gracjanpolak@gmail.com>,
+                     Jonathan Jouty <jonathan@scrive.com>,
+                     Mikhail Glushenkov <mikhail@scrive.com>
 Homepage:            https://github.com/scrive/happstack-static-routing
 Stability:           Development
 Category:            Web, Distributed Computing
 Build-type:          Simple
 Cabal-version:       >=1.6
+Tested-with:         GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4,
+                     GHC == 7.10.3, GHC == 8.0.1
+Extra-source-files:  README.md, CHANGELOG.md
 
+source-repository head
+  type: git
+  location: git://github.com/scrive/happstack-static-routing.git
 
 library
   exposed-modules:
@@ -37,7 +45,3 @@
   build-depends: containers >= 0.3
   build-depends: list-tries >= 0.4
   build-depends: transformers >= 0.2
-
-source-repository head
-  type: git
-  location: git://github.com/scrive/happstack-static-routing.git
diff --git a/src/Happstack/StaticRouting/Internal.hs b/src/Happstack/StaticRouting/Internal.hs
--- a/src/Happstack/StaticRouting/Internal.hs
+++ b/src/Happstack/StaticRouting/Internal.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE OverlappingInstances, FunctionalDependencies, ScopedTypeVariables,
+{-# LANGUAGE FunctionalDependencies, ScopedTypeVariables,
     MultiParamTypeClasses, FlexibleInstances, UndecidableInstances,
     FlexibleContexts, DeriveFunctor, PatternGuards, TupleSections #-}
 {-# OPTIONS_HADDOCK hide #-}
@@ -24,7 +24,7 @@
   | Param (Route a)
   | Handler EndSegment CheckApply a
   | Choice [Route a]
-  deriving (Show, Functor)
+  deriving Functor
 
 data Segment =
     StringS String | ParamS