diff --git a/.travis.yml b/.travis.yml
index b294c1229f0f6b250098d7f812e4d7a4fe6ecf34..31afdf6a9701ed658b4118aef949d9e6d664dba1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,10 @@ matrix:
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
     - env: CABALVER=1.24 GHCVER=8.2.2
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.2.2], sources: [hvr-ghc]}}
-    - env: CABALVER=1.24 GHCVER=8.4.3
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.4.3], sources: [hvr-ghc]}}
-    - env: CABALVER=2.4 GHCVER=8.6.1
-      addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
+    - env: CABALVER=1.24 GHCVER=8.4.4
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.4.4], sources: [hvr-ghc]}}
+    - env: CABALVER=2.4 GHCVER=8.6.5
+      addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
     - env: CABALVER=head GHCVER=head
       addons: {apt: {packages: [cabal-install-head,ghc-head],  sources: [hvr-ghc]}}
 
diff --git a/binary.cabal b/binary.cabal
index 9b258770fecd15c68ce9203995082407c4f1c421..3300d71e54aa01444f90c2ae9f7513daf794c3ae 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -1,5 +1,5 @@
 name:            binary
-version:         0.8.6.0
+version:         0.8.7.0
 license:         BSD3
 license-file:    LICENSE
 author:          Lennart Kolmodin <kolmodin@gmail.com>
@@ -18,7 +18,7 @@ category:        Data, Parsing
 stability:       provisional
 build-type:      Simple
 cabal-version:   >= 1.8
-tested-with:     GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2
+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
 extra-source-files:
   README.md changelog.md docs/hcar/binary-Lb.tex tools/derive/*.hs
 
@@ -76,6 +76,7 @@ test-suite qc
     Data.Binary.Put
   build-depends:
     base >= 4.5.0.0 && < 5,
+    base-orphans >=0.8.1 && <0.9,
     bytestring >= 0.10.4,
     random>=1.0.1.0,
     test-framework,
diff --git a/changelog.md b/changelog.md
index a9b5e6a422801a240bde07ae92590ee7abacdfca..ebc632b3327c3ea2a18b0fe8861eb12f3f2d70f2 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,19 +1,26 @@
 binary
 ======
 
-binary-0.10.0.0
----------------
+binary-0.8.7.0
+--------------
 
-- Add binary instance for Data.Functor.Identity from base, #146.
-- Don't use * when we have TypeOperators, #148.
+- MonadFail compatibility in base-4.13 (`fail` is not method of `Monad).
+- `Binary NonEmpty` `fail`s non empty lists, not `error`s
 
-binary-0.9.0.0
---------------
+binary-0.9.0.0 & binary-0.10.0.0
+--------------------------------
 
 - `0.8.5.0` was first released as version `0.9.0.0`. It didn't have any
   breaking changes though, so it was again released as version `0.8.5.0`
-  according to PVP. Next breaking release of `binary` will be version
-  `0.10.0.0`.
+  according to PVP.
+- `0.8.6.0` was first released as version `0.10.0.0`.
+
+binary-0.8.6.0
+---------------
+
+- Add binary instance for Data.Functor.Identity from base, #146.
+- Don't use * when we have TypeOperators, #148.
+
 
 binary-0.8.5.0
 --------------
diff --git a/tests/QC.hs b/tests/QC.hs
index 71d9cb862458eb54c587f1557fd0eed8d40a5fa8..7c47c3b1a6cfedffc31f3947b41b52e6c5acdeaa 100644
--- a/tests/QC.hs
+++ b/tests/QC.hs
@@ -24,6 +24,8 @@ import           Data.Ratio
 import           Data.Typeable
 import           System.IO.Unsafe
 
+import           Data.Orphans ()
+
 #ifdef HAS_NATURAL
 import           Numeric.Natural
 #endif
@@ -43,6 +45,7 @@ import           Data.Binary.Get
 import           Data.Binary.Put
 import qualified Data.Binary.Class as Class
 
+
 ------------------------------------------------------------------------
 
 roundTrip :: (Eq a, Binary a) => a -> (L.ByteString -> L.ByteString) -> Bool
@@ -499,10 +502,6 @@ genNaturalBig = do
 
 genFingerprint :: Gen Fingerprint
 genFingerprint = liftM2 Fingerprint arbitrary arbitrary
-#if !MIN_VERSION_base(4,7,0)
-instance Show Fingerprint where
-  show (Fingerprint x1 x2) = show (x1,x2)
-#endif
 
 ------------------------------------------------------------------------