diff --git a/CHANGES.markdown b/CHANGES.markdown
--- a/CHANGES.markdown
+++ b/CHANGES.markdown
@@ -1,23 +1,35 @@
+## Changes in 2.5.1
+  - Disable tests for Test.Hspec.Core.Timer (see #352)
+
 ## Changes in 2.5.0
+  - Add `sequential` (see #311)
   - Add support for `--diff` when `shouldBe` is uesd with
     `QuickCheck`-properties
-  - Add source locations when `shouldBe` is uesd with `QuickCheck`-properties
-  - Add `sequential` (see #311)
+  - Add source locations when `shouldBe` is uesd with `QuickCheck` properties
+  - Print `QuickCheck` labels on success (see #297)
+  - Retain output of `verbose`, `label`, `collect`, `classify`, etc. for
+    `QuickCheck` properties (see #257)
+  - Extract source location from error / undefined (see #316)
+  - Parse source locations from pattern match failures
+  - Include source column when formatting source locations
   - Colorize whitespaces with background color instead of foreground color with
     `--diff`
-  - Deprecate `--out`
-  - Removed deprecated module `Test.Hspec.HUnit`, use
-    `Test.Hspec.Contrib.HUnit` instead
   - Run `Test.Hspec.Core.Formatters.exampleProgress` in `FormatM` instead of
     `IO`
-  - Print QuickCheck labels on success (see #297)
-  - Include column when formatting source locations
-  - Extract source location from error / undefined (close #316)
-  - Remove BestEffort source locations
-  - Include duration for each spec item in new formatter API (see #315)
-  - Add location information to `pending`
   - Make sure that progress output is always cleared (fixes #301)
-  - Parse source locations from pattern match failures
+  - Add location information to `pending` (not used by any formatter yet)
+  - Include duration for each spec item in new formatter API (see #315) (not yet exposed)
+  - Removed deprecated module `Test.Hspec.HUnit`, use
+    `Test.Hspec.Contrib.HUnit` instead
+  - Deprecate `--out`
+  - Remove `BestEffort` source locations
+
+## Changes in 2.4.8
+  - compatibility with GHC 8.4.1-alpha3
+
+## Changes in 2.4.7
+  - compatibility with `QuickCheck-2.11.3` and up (note that `QuickCheck`
+    versions `2.11` to `2.11.2` are not fully supported)
 
 ## Changes in 2.4.6
   - compatibility with the upcoming version `4.11.0.0` of `base`
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2017 Simon Hengel <sol@typeful.net>
+Copyright (c) 2011-2018 Simon Hengel <sol@typeful.net>
 Copyright (c) 2011-2012 Trystan Spangler <trystan.s@comcast.net>
 Copyright (c) 2011-2011 Greg Weber <greg@gregweber.info>
 
diff --git a/hspec.cabal b/hspec.cabal
--- a/hspec.cabal
+++ b/hspec.cabal
@@ -1,14 +1,14 @@
--- This file has been generated from package.yaml by hpack version 0.25.0.
+-- This file has been generated from package.yaml by hpack version 0.28.2.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 5973a094a7e1665acc54acbbf4e2edfaf3caf3f63f400d39fbbd281fa1479892
+-- hash: cc8037ab82f8277af7aee801270c02aa011721d8f32f563be1520d25c0590137
 
 name:             hspec
-version:          2.5.0
+version:          2.5.1
 license:          MIT
 license-file:     LICENSE
-copyright:        (c) 2011-2017 Simon Hengel,
+copyright:        (c) 2011-2018 Simon Hengel,
                   (c) 2011-2012 Trystan Spangler,
                   (c) 2011 Greg Weber
 maintainer:       Simon Hengel <sol@typeful.net>
@@ -32,7 +32,6 @@
                   * automatic discovery of test files
                   .
                   The Hspec Manual is at <http://hspec.github.io/>.
-
 extra-source-files:
     CHANGES.markdown
 
@@ -49,8 +48,8 @@
     , QuickCheck >=2.10
     , base ==4.*
     , call-stack
-    , hspec-core ==2.5.0
-    , hspec-discover ==2.5.0
+    , hspec-core ==2.5.1
+    , hspec-discover ==2.5.1
     , hspec-expectations ==0.8.2.*
     , transformers >=0.2.2.0
   exposed-modules:
@@ -77,8 +76,8 @@
     , call-stack
     , directory
     , hspec
-    , hspec-core ==2.5.0
-    , hspec-discover ==2.5.0
+    , hspec-core ==2.5.1
+    , hspec-discover ==2.5.1
     , hspec-expectations ==0.8.2.*
     , hspec-meta >=2.3.2
     , stringbuilder