diff --git a/help.txt b/help.txt
new file mode 100644
--- /dev/null
+++ b/help.txt
@@ -0,0 +1,50 @@
+Usage: spec [OPTION]...
+
+OPTIONS
+              --help              display this help and exit
+              --ignore-dot-hspec  do not read options from ~/.hspec and .hspec
+  -m PATTERN  --match=PATTERN     only run examples that match given PATTERN
+              --skip=PATTERN      skip examples that match given PATTERN
+
+RUNNER OPTIONS
+        --[no-]dry-run          pretend that everything passed; don't verify
+                                anything
+        --[no-]focused-only     do not run anything, unless there are focused
+                                spec items
+        --[no-]fail-on-focused  fail on focused spec items
+        --[no-]fail-fast        abort on first failure
+        --[no-]randomize        randomize execution order
+  -r    --rerun                 rerun all examples that failed in the previous
+                                test run (only works in combination with
+                                --failure-report or in GHCi)
+        --failure-report=FILE   read/write a failure report for use with --rerun
+        --rerun-all-on-success  run the whole test suite after a previously
+                                failing rerun succeeds for the first time (only
+                                works in combination with --rerun)
+  -j N  --jobs=N                run at most N parallelizable tests
+                                simultaneously (default: number of available
+                                processors)
+
+FORMATTER OPTIONS
+  -f FORMATTER  --format=FORMATTER      use a custom formatter; this can be one
+                                        of checks, specdoc, progress,
+                                        failed-examples or silent
+                --[no-]color            colorize the output
+                --[no-]diff             show colorized diffs
+                --[no-]times            report times for individual spec items
+                --print-cpu-time        include used CPU time in summary
+  -p[N]         --print-slow-items[=N]  print the N slowest spec items (default:
+                                        10)
+
+OPTIONS FOR QUICKCHECK
+  -a N  --qc-max-success=N  maximum number of successful tests before a
+                            QuickCheck property succeeds
+        --qc-max-discard=N  maximum number of discarded tests per successful
+                            test before giving up
+        --qc-max-size=N     size to use for the biggest test cases
+        --qc-max-shrinks=N  maximum number of shrinks to perform before giving
+                            up (a value of 0 turns shrinking off)
+        --seed=N            used seed for QuickCheck properties
+
+OPTIONS FOR SMALLCHECK
+    --depth=N  maximum depth of generated test values for SmallCheck properties
diff --git a/hspec-core.cabal b/hspec-core.cabal
--- a/hspec-core.cabal
+++ b/hspec-core.cabal
@@ -5,7 +5,7 @@
 -- see: https://github.com/sol/hpack
 
 name:             hspec-core
-version:          2.8.4
+version:          2.8.5
 license:          MIT
 license-file:     LICENSE
 copyright:        (c) 2011-2021 Simon Hengel,
@@ -15,6 +15,7 @@
 build-type:       Simple
 extra-source-files:
     version.yaml
+    help.txt
 category:         Testing
 stability:        experimental
 bug-reports:      https://github.com/hspec/hspec/issues
@@ -105,6 +106,7 @@
     , ansi-terminal >=0.6.2
     , array
     , base >=4.5.0.0 && <5
+    , base-orphans
     , call-stack
     , clock >=0.7.1
     , deepseq
diff --git a/test/Helper.hs b/test/Helper.hs
--- a/test/Helper.hs
+++ b/test/Helper.hs
@@ -54,9 +54,7 @@
 import           Test.Hspec.Core.Util
 import qualified Test.Hspec.Core.Format as Format
 
-#if !MIN_VERSION_base(4,7,0)
-deriving instance Eq ErrorCall
-#endif
+import           Data.Orphans()
 
 exceptionEq :: E.SomeException -> E.SomeException -> Bool
 exceptionEq a b
diff --git a/version.yaml b/version.yaml
--- a/version.yaml
+++ b/version.yaml
@@ -1,1 +1,1 @@
-&version 2.8.4
+&version 2.8.5