diff --git a/src/multimodule/poi/java9/module-info.class b/src/multimodule/poi/java9/module-info.class
index 7e09b989a9..a8abd6c13b 100644
Binary files a/src/multimodule/poi/java9/module-info.class and b/src/multimodule/poi/java9/module-info.class differ
diff --git a/src/multimodule/poi/java9/module-info.java b/src/multimodule/poi/java9/module-info.java
index 50a41b014f..1ae77363e7 100644
--- a/src/multimodule/poi/java9/module-info.java
+++ b/src/multimodule/poi/java9/module-info.java
@@ -24,6 +24,9 @@ module org.apache.poi.poi {
     requires java.logging;
     requires java.desktop;
 
+    /* needed for CleanerUtil */
+    requires jdk.unsupported;
+
     uses org.apache.poi.ss.usermodel.WorkbookProvider;
 
     provides org.apache.poi.ss.usermodel.WorkbookProvider with org.apache.poi.hssf.usermodel.HSSFWorkbookFactory;
diff --git a/src/multimodule/poi/test9/module-info.class b/src/multimodule/poi/test9/module-info.class
index 01d4a48243..7695551235 100644
Binary files a/src/multimodule/poi/test9/module-info.class and b/src/multimodule/poi/test9/module-info.class differ
diff --git a/src/multimodule/poi/test9/module-info.java b/src/multimodule/poi/test9/module-info.java
index 26579cd98d..74dbd6d1a6 100644
--- a/src/multimodule/poi/test9/module-info.java
+++ b/src/multimodule/poi/test9/module-info.java
@@ -24,6 +24,9 @@ module org.apache.poi.poi {
     requires java.logging;
     requires java.desktop;
 
+    /* needed for CleanerUtil */
+    requires jdk.unsupported;
+
     uses org.apache.poi.ss.usermodel.WorkbookProvider;
 
     provides org.apache.poi.ss.usermodel.WorkbookProvider with org.apache.poi.hssf.usermodel.HSSFWorkbookFactory;