diff --git a/README.md b/README.md
index 84326bb50..697dafd0e 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,7 @@ Only a curated list of the [vast amount](http://geoserver.org/release/stable/) o
 - Pregeneralized feature datastore
 - vectortiles
 - flatgeobuf
+- dxf
 - cog
 - importer
 - imagepyramid
diff --git a/src/apps/geoserver/webui/pom.xml b/src/apps/geoserver/webui/pom.xml
index 9d4fbcfcd..33512e602 100644
--- a/src/apps/geoserver/webui/pom.xml
+++ b/src/apps/geoserver/webui/pom.xml
@@ -112,6 +112,14 @@
       <groupId>org.geoserver.community</groupId>
       <artifactId>gs-flatgeobuf</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.geoserver.extension</groupId>
+      <artifactId>gs-dxf-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.extension</groupId>
+      <artifactId>gs-dxf-wps</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.geoserver</groupId>
       <artifactId>gs-wms</artifactId>
diff --git a/src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/autoconfigure/web/wfs/WfsConfiguration.java b/src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/autoconfigure/web/wfs/WfsConfiguration.java
index e2af9aca3..2dffd299d 100644
--- a/src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/autoconfigure/web/wfs/WfsConfiguration.java
+++ b/src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/autoconfigure/web/wfs/WfsConfiguration.java
@@ -14,7 +14,8 @@
         locations = { //
             "jar:gs-web-wfs-.*!/applicationContext.xml", //
             "jar:gs-wfs-.*!/applicationContext.xml",
-            "jar:gs-flatgeobuf-.*!/applicationContext.xml#name=.*"
+            "jar:gs-flatgeobuf-.*!/applicationContext.xml#name=.*",
+            "jar:gs-dxf-core-.*!/applicationContext.xml#name=.*"
         } //
         )
 public class WfsConfiguration {}
diff --git a/src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/autoconfigure/web/wps/WpsConfiguration.java b/src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/autoconfigure/web/wps/WpsConfiguration.java
index d6e686b1b..0c54d8da5 100644
--- a/src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/autoconfigure/web/wps/WpsConfiguration.java
+++ b/src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/autoconfigure/web/wps/WpsConfiguration.java
@@ -15,6 +15,8 @@
             // exclude wpsRequestBuilder, DemosAutoConfiguration takes care of it
             "jar:gs-web-wps-.*!/applicationContext.xml#name=^(?!wpsRequestBuilder).*$",
             "jar:gs-wps-.*!/applicationContext.xml",
-            "jar:gs-wcs-.*!/applicationContext.xml"
+            "jar:gs-wcs-.*!/applicationContext.xml",
+            "jar:gs-dxf-core-.*!/applicationContext.xml#name=.*",
+            "jar:gs-dxf-wps-.*!/applicationContext.xml#name=.*"
         })
 public class WpsConfiguration {}
diff --git a/src/apps/geoserver/wfs/pom.xml b/src/apps/geoserver/wfs/pom.xml
index 0c3572fb8..b72b0989f 100644
--- a/src/apps/geoserver/wfs/pom.xml
+++ b/src/apps/geoserver/wfs/pom.xml
@@ -30,6 +30,10 @@
       <groupId>org.geoserver.community</groupId>
       <artifactId>gs-flatgeobuf</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.geoserver.extension</groupId>
+      <artifactId>gs-dxf-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
diff --git a/src/apps/geoserver/wfs/src/main/java/org/geoserver/cloud/wfs/config/WfsAutoConfiguration.java b/src/apps/geoserver/wfs/src/main/java/org/geoserver/cloud/wfs/config/WfsAutoConfiguration.java
index 20d3aa8e8..06503d42f 100644
--- a/src/apps/geoserver/wfs/src/main/java/org/geoserver/cloud/wfs/config/WfsAutoConfiguration.java
+++ b/src/apps/geoserver/wfs/src/main/java/org/geoserver/cloud/wfs/config/WfsAutoConfiguration.java
@@ -18,7 +18,8 @@
         reader = FilteringXmlBeanDefinitionReader.class, //
         locations = {
             "jar:gs-wfs-.*!/applicationContext.xml#name=.*",
-            "jar:gs-flatgeobuf-.*!/applicationContext.xml#name=.*"
+            "jar:gs-flatgeobuf-.*!/applicationContext.xml#name=.*",
+            "jar:gs-dxf-core-.*!/applicationContext.xml#name=.*"
         } //
         )
 public class WfsAutoConfiguration {
diff --git a/src/apps/geoserver/wps/pom.xml b/src/apps/geoserver/wps/pom.xml
index f9688c16c..e974de9cc 100644
--- a/src/apps/geoserver/wps/pom.xml
+++ b/src/apps/geoserver/wps/pom.xml
@@ -21,6 +21,14 @@
       <groupId>org.geoserver.cloud</groupId>
       <artifactId>gs-cloud-starter-raster-formats</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.geoserver.extension</groupId>
+      <artifactId>gs-dxf-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.extension</groupId>
+      <artifactId>gs-dxf-wps</artifactId>
+    </dependency>
     <dependency>
       <!-- REVISIT: for some reason, the WPS service won't start up without the web components. A bean creation exception 
         will be reported: "Error creating bean with name 'wpsInitializer' ... -->
diff --git a/src/apps/geoserver/wps/src/main/java/org/geoserver/cloud/wps/WpsApplicationConfiguration.java b/src/apps/geoserver/wps/src/main/java/org/geoserver/cloud/wps/WpsApplicationConfiguration.java
index 6a8c1d225..52338e89b 100644
--- a/src/apps/geoserver/wps/src/main/java/org/geoserver/cloud/wps/WpsApplicationConfiguration.java
+++ b/src/apps/geoserver/wps/src/main/java/org/geoserver/cloud/wps/WpsApplicationConfiguration.java
@@ -22,6 +22,8 @@
             "jar:gs-wcs1_1-.*!/applicationContext.xml", //
             "jar:gs-wcs2_0-.*!/applicationContext.xml", //
             "jar:gs-wfs-.*!/applicationContext.xml#name=^(?!wfsInsertElementHandler|wfsUpdateElementHandler|wfsDeleteElementHandler|wfsReplaceElementHandler).*$", //
+            "jar:gs-dxf-core-.*!/applicationContext.xml#name=.*",
+            "jar:gs-dxf-wps-.*!/applicationContext.xml#name=.*"
         })
 public class WpsApplicationConfiguration {
 
diff --git a/src/pom.xml b/src/pom.xml
index 1b13798d4..f54ef11db 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -588,6 +588,16 @@
         <artifactId>gs-flatgeobuf</artifactId>
         <version>${gs.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.geoserver.extension</groupId>
+        <artifactId>gs-dxf-core</artifactId>
+        <version>${gs.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.geoserver.extension</groupId>
+        <artifactId>gs-dxf-wps</artifactId>
+        <version>${gs.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.geoserver.extension</groupId>
         <artifactId>gs-web-resource</artifactId>