diff --git a/pom.xml b/pom.xml
index 94d4e13..0333a59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
             <dependency>
                 <groupId>io.smallrye.common</groupId>
                 <artifactId>smallrye-common-bom</artifactId>
-                <version>2.4.0</version>
+                <version>2.5.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -203,8 +203,24 @@
                         <jboss.threads.eqe.unlimited-queue>${jboss.threads.eqe.unlimited-queue}</jboss.threads.eqe.unlimited-queue>
                         <jboss.threads.eqe.register-mbean>${jboss.threads.eqe.register-mbean}</jboss.threads.eqe.register-mbean>
                     </systemPropertyVariables>
+                    <forkMode>always</forkMode>
+                    <useModulePath>true</useModulePath>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>io.github.dmlloyd.module-info</groupId>
+                <artifactId>module-info</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <id>module-info</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/main/java/module-info.yml b/src/main/java/module-info.yml
new file mode 100644
index 0000000..754c99a
--- /dev/null
+++ b/src/main/java/module-info.yml
@@ -0,0 +1,10 @@
+name: org.jboss.threads
+
+requires:
+  - module: jdk.unsupported
+  - module: org.jboss.logging
+  - module: org.wildfly.common
+  - module: io.smallrye.common.annotation
+  - module: io.smallrye.common.constraint
+  - module: io.smallrye.common.cpu
+  - module: io.smallrye.common.function
diff --git a/src/main/java/org/jboss/threads/Messages.java b/src/main/java/org/jboss/threads/Messages.java
index 7e87533..ac0fd53 100644
--- a/src/main/java/org/jboss/threads/Messages.java
+++ b/src/main/java/org/jboss/threads/Messages.java
@@ -1,5 +1,7 @@
 package org.jboss.threads;
 
+import static java.lang.invoke.MethodHandles.*;
+
 import java.time.Duration;
 
 import org.jboss.logging.BasicLogger;
@@ -14,8 +16,8 @@
  */
 @MessageLogger(projectCode = "JBTHR", length = 5)
 interface Messages extends BasicLogger {
-    Messages msg = Logger.getMessageLogger(Messages.class, "org.jboss.threads");
-    Messages intMsg = Logger.getMessageLogger(Messages.class, "org.jboss.threads.interrupt-handler");
+    Messages msg = Logger.getMessageLogger(lookup(), Messages.class, "org.jboss.threads");
+    Messages intMsg = Logger.getMessageLogger(lookup(), Messages.class, "org.jboss.threads.interrupt-handler");
 
     // version
     @Message(value = "JBoss Threads version %s")