diff --git a/core/pom.xml b/core/pom.xml
index 73aee7392..800243332 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -89,7 +89,8 @@
                     <failOnError>true</failOnError>
                 </configuration>
             </plugin>
-        </plugins>
+			
+		</plugins>
     </build>
     <profiles>
         <profile>
@@ -180,8 +181,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
+            <groupId>org.apache.struts</groupId>
+			<artifactId>struts2-freemarker-jakarta</artifactId>
         </dependency>
 
         <dependency>
diff --git a/freemarker-jakarta/README.md b/freemarker-jakarta/README.md
new file mode 100644
index 000000000..8702074d9
--- /dev/null
+++ b/freemarker-jakarta/README.md
@@ -0,0 +1,3 @@
+# Struts 2 Freemarker Jakarta
+This uses the eclipse transformer maven plugin to make the Freemarker dependency Jakarta EE 9+ compatible.
+
diff --git a/freemarker-jakarta/pom.xml b/freemarker-jakarta/pom.xml
new file mode 100644
index 000000000..744cd145c
--- /dev/null
+++ b/freemarker-jakarta/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more
+contributor license agreements.  See the NOTICE file
+ * distributed with this
+work for additional information
+ * regarding copyright ownership.  The ASF
+licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ *
+"License"); you may not use this file except in compliance
+ * with the License.
+You may obtain a copy of the License at
+ *
+ *
+http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable
+law or agreed to in writing,
+ * software distributed under the License is
+distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *
+KIND, either express or implied.  See the License for the
+ * specific language
+governing permissions and limitations
+ * under the License.
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.struts</groupId>
+		<artifactId>struts2-parent</artifactId>
+		<version>6.4.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>struts2-freemarker-jakarta</artifactId>
+	<packaging>jar</packaging>
+	<name>Struts 2 Jakarta EE Compatible Freemarker</name>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.site.skip>true</maven.site.skip>
+		<maven.site.deploy.skip>true</maven.site.deploy.skip>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.transformer</groupId>
+				<artifactId>transformer-maven-plugin</artifactId>
+				<version>0.5.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<extensions>true</extensions> 
+					<rules>
+						<jakartaDefaults>true</jakartaDefaults>
+					</rules>
+				</configuration>
+				<executions>
+					<execution>
+						<id>eclipse-transformer-freemarker-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<artifact>
+								<groupId>org.freemarker</groupId>
+								<artifactId>freemarker</artifactId>
+								<version>${freemarker.version}</version>
+							</artifact>
+						</configuration>
+					</execution>
+
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+	</dependencies>
+
+</project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 30375f0de..e73d12e7e 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -46,7 +46,10 @@
         <module>osgi</module>
         <module>plexus</module>
         <module>rest</module>
-        <module>sitemesh</module>
+        
+        <!-- TODO -->
+        <!--module>sitemesh</module-->
+        
         <module>spring</module>
         <module>testng</module>
         <module>tiles</module>
diff --git a/pom.xml b/pom.xml
index 0a4a2500c..bdb2be073 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
 
     <modules>
         <module>bom</module>
+        <module>freemarker-jakarta</module>
         <module>core</module>
         <module>plugins</module>
         <module>bundles</module>
@@ -522,8 +523,19 @@
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts-annotations</artifactId>
                 <version>1.0.8</version>
+                <exclusions>
+					<exclusion>
+						 <groupId>org.freemarker</groupId>
+                		 <artifactId>freemarker</artifactId>
+					</exclusion>
+				</exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-freemarker-jakarta</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-core</artifactId>