3 files changed, 24 insertions, 1 deletions
diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk
index 50b32e8f0f88..2acf20b5b289 100644
--- a/ridljar/Jar_unoloader.mk
+++ b/ridljar/Jar_unoloader.mk
@@ -7,12 +7,21 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Jar_Jar,unoloader))
+$(eval $(call gb_Jar_Jar,unoloader,org.libreoffice.unoloader))
 
 $(eval $(call gb_Jar_set_packageroot,unoloader,com))
 
 $(eval $(call gb_Jar_set_manifest,unoloader,$(SRCDIR)/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest))
 
+# the module-info.class is manually added here since it's not in "com" dir
+$(eval $(call gb_Jar_add_packagedirs,unoloader,\
+	$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,unoloader))/module-info.class \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\
+    ridljar/source/unoloader/module-info \
+))
+
 $(eval $(call gb_Jar_add_sourcefiles,unoloader,\
     ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader \
     ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader \
diff --git a/ridljar/source/libreoffice/module-info.java b/ridljar/source/libreoffice/module-info.java
index 4399586fc558..8d24c7ccb13c 100644
--- a/ridljar/source/libreoffice/module-info.java
+++ b/ridljar/source/libreoffice/module-info.java
@@ -8,6 +8,8 @@
 
 module org.libreoffice.uno
 {
+    requires org.libreoffice.unoloader;
+
     exports com.sun.star.accessibility;
     exports com.sun.star.animations;
     exports com.sun.star.auth;
diff --git a/ridljar/source/unoloader/module-info.java b/ridljar/source/unoloader/module-info.java
new file mode 100644
index 000000000000..6eed39c96df4
--- /dev/null
+++ b/ridljar/source/unoloader/module-info.java
@@ -0,0 +1,12 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+module org.libreoffice.unoloader
+{
+    exports com.sun.star.lib.unoloader;
+}