diff --git a/pom.xml b/pom.xml
index 03f22f7ce00..c1e0319d8e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
   LTS releases.
   These are 8, 11, 12 and 21 currently, see:
   https://github.com/apache/commons-lang/blob/master/.github/workflows/maven.yml
-  
+
   Please ensure your build environment is up-to-date and kindly report any build issues.
   </description>
 
@@ -111,7 +111,7 @@
       <email>ggregory at apache.org</email>
       <url>https://www.garygregory.com</url>
       <organization>The Apache Software Foundation</organization>
-      <organizationUrl>https://www.apache.org/</organizationUrl>      
+      <organizationUrl>https://www.apache.org/</organizationUrl>
       <roles>
         <role>PMC Member</role>
       </roles>
@@ -775,6 +775,38 @@
           <excludeFilterFile>${basedir}/src/conf/spotbugs-exclude-filter.xml</excludeFilterFile>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <jvmVersion>${moditect.java.version}</jvmVersion>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <failOnWarning>false</failOnWarning>
+              <module>
+                <moduleInfo>
+                  <name>${commons.module.name}</name>
+                  <exports>
+                    *;
+                  </exports>
+                  <requires>
+                    static java.desktop;
+                    *;
+                  </requires>
+                  <addServiceUses>${commons.moditect-maven-plugin.addServiceUses}</addServiceUses>
+                </moduleInfo>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -945,10 +977,10 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <excludes>
-                <exclude>org/apache/commons/lang3/time/Java15BugFastDateParserTest.java</exclude>               
+                <exclude>org/apache/commons/lang3/time/Java15BugFastDateParserTest.java</exclude>
               </excludes>
             </configuration>
-          </plugin>        
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java
index 1d6762928a3..fd4ec3012de 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java
@@ -86,14 +86,21 @@ protected static boolean isOpen(final State state) {
     /** The current state of this circuit breaker. */
     protected final AtomicReference<State> state = new AtomicReference<>(State.CLOSED);
 
+    /**
+     * Monitor for usages of change support to enable lazy initialization of that field.
+     * This lets us require the {@code java.desktop} module statically, significantly reducing
+     * the jlink-ed size of all downstream apache commons libraries.
+     */
+    private final Object changeSupportMonitor = new Object();
+
     /** An object for managing change listeners registered at this instance. */
-    private final PropertyChangeSupport changeSupport;
+    private PropertyChangeSupport changeSupport;
 
     /**
      * Creates an {@link AbstractCircuitBreaker}. It also creates an internal {@link PropertyChangeSupport}.
      */
     public AbstractCircuitBreaker() {
-        changeSupport = new PropertyChangeSupport(this);
+        changeSupport = null;
     }
 
     /**
@@ -101,10 +108,21 @@ public AbstractCircuitBreaker() {
      * the state of this circuit breaker changes. If the listener is
      * <strong>null</strong>, it is silently ignored.
      *
+     * <p>
+     * If the {@code java.desktop} module is not present in the JRE,
+     * calling this method will throw an exception.
+     * </p>
+     *
      * @param listener the listener to be added
      */
     public void addChangeListener(final PropertyChangeListener listener) {
-        changeSupport.addPropertyChangeListener(listener);
+        synchronized (changeSupportMonitor) {
+            if (changeSupport == null) {
+                changeSupport = new PropertyChangeSupport(this);
+            }
+
+            changeSupport.addPropertyChangeListener(listener);
+        }
     }
 
     /**
@@ -115,7 +133,11 @@ public void addChangeListener(final PropertyChangeListener listener) {
      */
     protected void changeState(final State newState) {
         if (state.compareAndSet(newState.oppositeState(), newState)) {
-            changeSupport.firePropertyChange(PROPERTY_NAME, !isOpen(newState), isOpen(newState));
+            synchronized (changeSupportMonitor) {
+                if (changeSupport != null) {
+                    changeSupport.firePropertyChange(PROPERTY_NAME, !isOpen(newState), isOpen(newState));
+                }
+            }
         }
     }
 
@@ -169,7 +191,11 @@ public void open() {
      * @param listener the listener to be removed
      */
     public void removeChangeListener(final PropertyChangeListener listener) {
-        changeSupport.removePropertyChangeListener(listener);
+        synchronized (changeSupportMonitor) {
+            if (changeSupport != null) {
+                changeSupport.removePropertyChangeListener(listener);
+            }
+        }
     }
 
 }