diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+= Version 1.3.1, 2016-06-09 =
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+* GHC 8 compatibility
+
 = Version 1.3.0.1, 2012-12-14 =
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 * Relax dependencies -- allow older versions of containers.
diff --git a/Data/HashMap.hs b/Data/HashMap.hs
--- a/Data/HashMap.hs
+++ b/Data/HashMap.hs
@@ -210,7 +210,7 @@
     return (fromList xs,t)
 #endif
 
-#include "Typeable.h"
+#include "hashmap.h"
 INSTANCE_TYPEABLE2(Map,mapTc,"Map")
 
 
diff --git a/Data/HashSet.hs b/Data/HashSet.hs
--- a/Data/HashSet.hs
+++ b/Data/HashSet.hs
@@ -139,7 +139,7 @@
     return (fromList xs,t)
 #endif
 
-#include "Typeable.h"
+#include "hashmap.h"
 INSTANCE_TYPEABLE1(Set,setTc,"Set")
 
 
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright Milan Straka 2011
+Copyright Milan Straka 2011-2012, Ryan Scott 2016
 
 All rights reserved.
 
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+# `hashmap`
+[![Hackage](https://img.shields.io/hackage/v/hashmap.svg)][Hackage: hashmap]
+[![Hackage Dependencies](https://img.shields.io/hackage-deps/v/hashmap.svg)](http://packdeps.haskellers.com/reverse/hashmap)
+[![Haskell Programming Language](https://img.shields.io/badge/language-Haskell-blue.svg)][Haskell.org]
+[![BSD3 License](http://img.shields.io/badge/license-BSD3-brightgreen.svg)][tl;dr Legal: BSD3]
+[![Build](https://img.shields.io/travis/foxik/hashmap.svg)](https://travis-ci.org/foxik/hashmap)
+
+[Hackage: hashmap]:
+  http://hackage.haskell.org/package/hashmap
+  "hashmap package on Hackage"
+[Haskell.org]:
+  http://www.haskell.org
+  "The Haskell Programming Language"
+[tl;dr Legal: BSD3]:
+  https://tldrlegal.com/license/bsd-3-clause-license-%28revised%29
+  "BSD 3-Clause License (Revised)"
+
+:warning: Deprecated in favor of [`unordered-containers`](https://github.com/tibbe/unordered-containers)
+
+An implementation of persistent `Map` and `Set` containers based on hashing. The implementation is build on top of `Data.IntMap.IntMap` and `Data.IntSet.IntSet`, with very similar API. It uses `Hashable` class from the `hashable` package for hashing.
+
+This package can be used as a drop-in replacement for `Data.Map` and `Data.Set` modules.
+
+The `Map key value` is an `Data.IntMap.IntMap` indexed by the hash value, containing either one (`key`, `value`) or a `Data.Map.Map key value` for all keys with the same hash value.
+
+The `Set elem` is an `Data.IntMap.IntMap` indexed by the hash value, containing either one `elem` or `Data.Set.Set elem` for all elements with the same hash value.
diff --git a/hashmap.cabal b/hashmap.cabal
--- a/hashmap.cabal
+++ b/hashmap.cabal
@@ -1,5 +1,5 @@
 Name:                hashmap
-Version:             1.3.0.1
+Version:             1.3.1
 Synopsis:            Persistent containers Map and Set based on hashing.
 Description:         An implementation of persistent 'Map' and 'Set' containers
                      based on hashing. The implementation is build on
@@ -17,23 +17,37 @@
                      The @'Set' elem@ is an 'Data.IntMap.IntMap' indexed by
                      the hash value, containing either one 'elem' or @'Data.Set.Set' elem@ for
                      all elements with the same hash value.
-Homepage:            http://git.auryn.cz/haskell/hashmap/
+Homepage:            https://github.com/foxik/hashmap
+bug-reports:         https://github.com/foxik/hashmap/issues
 License:             BSD3
 License-file:        LICENSE
 Author:              Milan Straka
-Maintainer:          fox@ucw.cz
+Maintainer:          Ryan Scott <ryan.gl.scott@gmail.com>
 Stability:           Provisional
+copyright:           (C) 2011-2012 Milan Straka, 2016 Ryan Scott
 Category:            Data
 Build-type:          Simple
 Cabal-version:       >= 1.6
-Extra-source-files:  CHANGES
+Extra-source-files:  CHANGES, README.md
+tested-with:         GHC == 7.0.4
+                   , GHC == 7.2.2
+                   , GHC == 7.4.2
+                   , GHC == 7.6.3
+                   , GHC == 7.8.4
+                   , GHC == 7.10.3
+                   , GHC == 8.0.1
 
+source-repository head
+  type: git
+  location: https://github.com/foxik/hashmap
+
 Flag OldContainers
   Description: Use old version of containers where NFData instances are provided by deepseq.
   Default: False
 
 Library
   Exposed-modules: Data.HashMap, Data.HashSet
+  include-dirs: include
 
   Build-depends: base >= 4.0 && < 5, hashable >= 1.0
   if !flag(OldContainers)