diff --git a/CHANGES b/CHANGES
index 02e745b..61f6f74 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,10 @@
 This file describes changes in the GAP package 'nq'.
 ===========================================================================
 
-X.Y.Z (YYYY-MM-DD)
+2.5.8 (2022-04-04)
   - Restore `--with-gmp` configure option
+  - Restore `make test`
+  - Various janitorial changes
 
 2.5.7 (2022-03-16)
   - Don't abort certain computations just because an "unknown"
diff --git a/PackageInfo.g b/PackageInfo.g
index 0f04b2d..61625e6 100644
--- a/PackageInfo.g
+++ b/PackageInfo.g
@@ -9,8 +9,8 @@ SetPackageInfo( rec(
 
 PackageName := "nq",
 Subtitle := "Nilpotent Quotients of Finitely Presented Groups",
-Version := "2.5.7",
-Date    := "16/03/2022", # dd/mm/yyyy format
+Version := "2.5.8",
+Date    := "04/04/2022", # dd/mm/yyyy format
 License := "GPL-2.0-or-later",
 
 Persons := [
diff --git a/VERSION b/VERSION
index 6de6d05..a5c51e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.7
\ No newline at end of file
+2.5.8
\ No newline at end of file