diff --git a/.gitignore b/.gitignore
index ba7ec9d..1da331f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /js-chart-2.9.4.1.tar.gz
 /criterion-1.5.9.0.tar.gz
 /criterion-measurement-0.1.3.0.tar.gz
+/criterion-1.5.13.0.tar.gz
diff --git a/criterion-1.5.9.0.cabal b/criterion-1.5.13.0.cabal
similarity index 85%
rename from criterion-1.5.9.0.cabal
rename to criterion-1.5.13.0.cabal
index ca8e4b2..cb19d9d 100644
--- a/criterion-1.5.9.0.cabal
+++ b/criterion-1.5.13.0.cabal
@@ -1,5 +1,5 @@
 name:           criterion
-version:        1.5.9.0
+version:        1.5.13.0
 x-revision: 1
 synopsis:       Robust, reliable performance measurement and analysis
 license:        BSD3
@@ -9,7 +9,7 @@ maintainer:     Ryan Scott <ryan.gl.scott@gmail.com>
 copyright:      2009-2016 Bryan O'Sullivan and others
 category:       Development, Performance, Testing, Benchmarking
 homepage:       http://www.serpentine.com/criterion
-bug-reports:    https://github.com/bos/criterion/issues
+bug-reports:    https://github.com/haskell/criterion/issues
 build-type:     Simple
 cabal-version:  >= 1.10
 extra-source-files:
@@ -27,8 +27,10 @@ tested-with:
   GHC==8.2.2,
   GHC==8.4.4,
   GHC==8.6.5,
-  GHC==8.8.3,
-  GHC==8.10.1
+  GHC==8.8.4,
+  GHC==8.10.7,
+  GHC==9.0.2,
+  GHC==9.2.1
 
 data-files:
   templates/*.css
@@ -74,16 +76,19 @@ library
     Criterion.Types
 
   other-modules:
+    Criterion.Main.Options.Internal
     Criterion.Monad.Internal
 
   other-modules:
     Paths_criterion
 
   build-depends:
-    aeson >= 1,
+    -- TODO: Eventually, we should bump the lower version bounds to >=2 so that
+    -- we can remove some CPP in Criterion.Report. See #247.
+    aeson >= 1 && < 2.1,
     ansi-wl-pprint >= 0.6.7.2,
     base >= 4.5 && < 5,
-    base-compat-batteries >= 0.10 && < 0.12,
+    base-compat-batteries >= 0.10 && < 0.13,
     binary >= 0.5.1.0,
     binary-orphans >= 1.0.1 && < 1.1,
     bytestring >= 0.9 && < 1.0,
@@ -100,9 +105,10 @@ library
     js-chart >= 2.9.4 && < 3,
     mtl >= 2,
     mwc-random >= 0.8.0.3,
-    optparse-applicative >= 0.13,
+    -- TODO: Depend on optparse-applicative-0.17 as the minimum (see #258)
+    optparse-applicative >= 0.13 && < 0.18,
     parsec >= 3.1.0,
-    statistics >= 0.14 && < 0.16,
+    statistics >= 0.14 && < 0.17,
     text >= 0.11,
     time,
     transformers,
@@ -195,7 +201,7 @@ test-suite tests
     tasty-hunit,
     tasty-quickcheck,
     vector,
-    aeson >= 0.8
+    aeson
 
 test-suite cleanup
   type:                 exitcode-stdio-1.0
@@ -219,4 +225,4 @@ test-suite cleanup
 
 source-repository head
   type:     git
-  location: https://github.com/bos/criterion.git
+  location: https://github.com/haskell/criterion.git
diff --git a/ghc-criterion.spec b/ghc-criterion.spec
index cb9d74b..5b2c634 100644
--- a/ghc-criterion.spec
+++ b/ghc-criterion.spec
@@ -13,9 +13,9 @@
 %bcond_with tests
 
 Name:           ghc-%{pkg_name}
-Version:        1.5.9.0
+Version:        1.5.13.0
 # can only be reset when all subpkgs bumped
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Robust, reliable performance measurement and analysis
 
 License:        BSD
@@ -192,6 +192,9 @@ echo "%{_datadir}/%{jschart}/Chart.*.*" >> %{jschart}/ghc-js-chart.files
 
 
 %changelog
+* Tue Jun 07 2022 Jens Petersen <petersen@redhat.com> - 1.5.13.0-12
+- https://hackage.haskell.org/package/criterion-1.5.13.0/changelog
+
 * Thu Mar 10 2022 Jens Petersen <petersen@redhat.com> - 1.5.9.0-11
 - rebuild
 
diff --git a/sources b/sources
index f2d1644..65c44f1 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (criterion-1.5.9.0.tar.gz) = ba8550073977ac829d35e327bc976a6a914694d2e9eb29f25c40811ec4064249dba746ac7a3df1b21532ca64c62375d9b35c201c7e259801f21ccde883647ca8
 SHA512 (criterion-measurement-0.1.3.0.tar.gz) = f693ef3e8986eba70e4d0268ef16b9644aa4a99eb7d13c356ddfcb9af031a053bce81c272a561dd99f6be1eb18b862ee74cdf0fa3eeecc99d0083d35650b1d19
 SHA512 (binary-orphans-1.0.1.tar.gz) = 067df608ec5fee2907c1648c19116a4de7a237c41101e811ba02789fbe22c5726443d4950b03bd156ad8ea336acc6c71da3efe7a6cf1127519ec5eb9778ec11d
 SHA512 (js-chart-2.9.4.1.tar.gz) = 0e6325e12822d2607e04ac61e91963f4aed77a8700ec3bb3bc0662a9006780b6a60361ce135452a684dff048e6089f6057a85b2a83b093448f19dd4eeaf4ebae
+SHA512 (criterion-1.5.13.0.tar.gz) = 0c3c8c5135e219f6c3dca07760e90a33aac2b499afefcb8206f38bbab43bb6fc5532ea4154200979b760cfc0bf030454bed747a30255561f2508033ee40764c0