diff --git a/Changes b/Changes
index e6d9a37..9b1885f 100644
--- a/Changes
+++ b/Changes
@@ -1,7 +1,9 @@
-0.58.1 2018-10-23
+0.58.1 2018-10-31
     - [bugfix] Security upgrade of Jackson for CVE-2017-17485 and
       CVE-2018-7489 (diewald)
-    - [bugfix] Span expansion with negation (margaretha)  
+    - [bugfix] Span expansion with negation (margaretha)
+    - [bugfix] OpenJDK8u181-workaround (see Debian Bug report #911925)
+      (diewald)
 
 0.58.0 2018-09-03
     - [feature] Implemented referencing cached collection (margaretha)
diff --git a/pom.xml b/pom.xml
index f994206..8acde35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,8 +282,9 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.16</version>
+				<version>2.22.1</version>
 				<configuration>
+          <useSystemClassLoader>false</useSystemClassLoader>
 					<excludes>
 						<exclude>**/benchmark/*</exclude>
 						<exclude>**/TestWPDIndex.java</exclude>