diff --git a/build.gradle b/build.gradle
index e942fe2262b..863dd68d3db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -582,41 +582,81 @@ jlink {
 
     // TODO: Remove the following correction to the merged module
     // The module descriptor automatically generated by the plugin for the merged module contained some invalid entries.
-    // Execute ./gradlew suggestMergedModuleInfo and include the incorrect directives here.
+    // Execute ./gradlew suggestMergedModuleInfo and include the suggested directives here.
     mergedModule {
-        requires 'java.logging'
-        requires 'jdk.xml.dom'
-        requires 'java.sql'
-        requires 'java.rmi'
         requires 'java.xml'
         requires 'com.sun.xml.txw2'
-        requires 'com.google.gson'
         requires 'java.desktop'
-        requires 'java.security.jgss'
-        requires 'jdk.jsobject'
+        requires 'org.objectweb.asm'
+        requires 'jdk.jfr'
         requires 'jdk.unsupported'
+        requires 'com.google.gson'
         requires 'java.management'
         requires 'java.naming'
-        requires 'jdk.unsupported.desktop'
         requires 'java.security.sasl'
+        requires 'com.sun.xml.fastinfoset'
+        requires 'jdk.security.jgss'
+        requires 'java.logging'
+        requires 'jdk.xml.dom'
+        requires 'java.sql'
+        requires 'java.rmi'
+        requires 'java.security.jgss'
+        requires 'com.oracle.truffle.regex'
+        requires 'jdk.jsobject'
+        requires 'jdk.management'
+        requires 'jdk.unsupported.desktop'
+        requires 'org.objectweb.asm.util'
         requires 'java.scripting'
+        requires 'org.objectweb.asm.commons'
+        requires 'org.graalvm.truffle'
         requires 'java.datatransfer'
         requires 'java.compiler'
+        requires 'java.sql.rowset'
         requires 'java.transaction.xa'
-        requires 'com.sun.xml.fastinfoset'
+        requires 'org.graalvm.sdk'
         requires 'org.slf4j'
-        uses 'com.airhacks.afterburner.injection.PresenterFactory'
+        uses 'org.apache.logging.log4j.util.PropertySource'
+        uses 'org.apache.logging.log4j.core.util.WatchEventService'
+        uses 'org.apache.logging.log4j.plugins.processor.PluginService'
         uses 'org.controlsfx.glyphfont.GlyphFont'
         uses 'com.airhacks.afterburner.views.ResourceLocator'
+        uses 'com.oracle.truffle.js.runtime.Evaluator'
+        uses 'org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory'
+        uses 'com.airhacks.afterburner.injection.PresenterFactory'
+        uses 'com.oracle.truffle.js.runtime.builtins.JSFunctionLookup'
+        uses 'org.apache.logging.log4j.spi.Provider'
+        uses 'org.mariadb.jdbc.tls.TlsSocketPlugin'
+        uses 'org.mariadb.jdbc.LocalInfileInterceptor'
         uses 'javax.xml.bind.JAXBContextFactory'
-        provides 'java.sql.Driver' with 'org.postgresql.Driver'
+        provides 'javax.annotation.processing.Processor' with 'org.apache.logging.log4j.plugins.processor.PluginProcessor'
         provides 'org.controlsfx.glyphfont.GlyphFont' with 'org.controlsfx.glyphfont.FontAwesome'
-        provides 'org.apache.commons.logging.LogFactory' with 'org.apache.logging.log4j.jcl.LogFactoryImpl'
-        provides 'org.slf4j.spi.SLF4JServiceProvider' with 'org.apache.logging.slf4j.SLF4JServiceProvider'
+        provides 'org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory' with 'org.apache.logging.log4j.core.message.ExtendedThreadInfoFactory'
+        provides 'org.mariadb.jdbc.tls.TlsSocketPlugin' with 'org.mariadb.jdbc.internal.protocol.tls.DefaultTlsSocketPlugin'
         provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.ServerProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.netty.shaded.io.grpc.netty.NettyServerProvider'
+        provides 'com.oracle.truffle.js.runtime.Evaluator' with 'com.oracle.truffle.js.parser.GraalJSEvaluator'
         provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.NameResolverProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.internal.DnsNameResolverProvider'
-        provides 'java.security.Provider' with 'org.bouncycastle.jce.provider.BouncyCastleProvider', 'org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider'
+        provides 'org.apache.logging.log4j.util.PropertySource' with 'org.apache.logging.log4j.util.EnvironmentPropertySource',
+                'org.apache.logging.log4j.util.SystemPropertiesPropertySource'
+        provides 'java.sql.Driver' with 'org.postgresql.Driver'
+        provides 'org.apache.logging.log4j.plugins.processor.PluginService' with 'org.apache.logging.log4j.plugins.convert.plugins.Log4jPlugins'
+        provides 'org.mariadb.jdbc.authentication.AuthenticationPlugin' with 'org.mariadb.jdbc.internal.com.send.authentication.CachingSha2PasswordPlugin',
+                'org.mariadb.jdbc.internal.com.send.authentication.ClearPasswordPlugin',
+                'org.mariadb.jdbc.internal.com.send.authentication.Ed25519PasswordPlugin',
+                'org.mariadb.jdbc.internal.com.send.authentication.NativePasswordPlugin',
+                'org.mariadb.jdbc.internal.com.send.authentication.OldPasswordPlugin',
+                'org.mariadb.jdbc.internal.com.send.authentication.SendGssApiAuthPacket',
+                'org.mariadb.jdbc.internal.com.send.authentication.SendPamAuthPacket',
+                'org.mariadb.jdbc.internal.com.send.authentication.Sha256PasswordPlugin'
+        provides 'org.mariadb.jdbc.credential.CredentialPlugin' with 'org.mariadb.jdbc.credential.aws.AwsIamCredentialPlugin',
+                'org.mariadb.jdbc.credential.env.EnvCredentialPlugin',
+                'org.mariadb.jdbc.credential.system.PropertiesCredentialPlugin'
+        provides 'org.apache.commons.logging.LogFactory' with 'org.apache.logging.log4j.jcl.LogFactoryImpl'
+        provides 'org.slf4j.spi.SLF4JServiceProvider' with 'org.apache.logging.slf4j.SLF4JServiceProvider'
+        provides 'org.apache.logging.log4j.spi.Provider' with 'org.apache.logging.log4j.core.impl.Log4jProvider'
+        provides 'java.security.Provider' with 'org.bouncycastle.jce.provider.BouncyCastleProvider',
+                'org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider'
         provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.ManagedChannelProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.netty.shaded.io.grpc.netty.NettyChannelProvider'
+        provides 'com.oracle.truffle.js.runtime.builtins.JSFunctionLookup' with 'com.oracle.truffle.js.builtins.JSDefaultBuiltinLookup'
     }
 
     jpackage {
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 0573733ae7a..e19f933fcb8 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -6,6 +6,7 @@
     requires java.sql;
 
     // JavaFX
+    requires javafx.base;
     requires javafx.graphics;
     requires javafx.swing;
     requires javafx.controls;
@@ -72,9 +73,10 @@
     requires java.string.similarity;
     requires ojdbc10;
     requires org.postgresql.jdbc;
+    requires org.mariadb.jdbc;
+    uses org.mariadb.jdbc.credential.CredentialPlugin;
     requires org.apache.commons.lang3;
     requires org.antlr.antlr4.runtime;
     requires flowless;
     requires org.apache.tika.core;
-    requires javafx.base;
 }