diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml
index feff2c111e..a437c7744f 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml
@@ -70,11 +70,11 @@
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
-      <version>2.3.26-incubating</version>
+      <version>2.3.29</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://git-wip-us.apache.org/repos/asf?p=freemarker.git;a=blob_plain;f=LICENSE;hb=v2.3.26</url>
+          <url>https://git-wip-us.apache.org/repos/asf?p=freemarker.git;a=blob_plain;f=LICENSE;hb=v2.3.29</url>
         </license>
       </licenses>
     </dependency>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.freemarker,freemarker,2.3.26-incubating,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.freemarker,freemarker,2.3.29,Apache Software License 2.0.txt
similarity index 93%
rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.freemarker,freemarker,2.3.26-incubating,Apache Software License 2.0.txt
rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.freemarker,freemarker,2.3.29,Apache Software License 2.0.txt
index 7449e24287..1121ebaa2a 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.freemarker,freemarker,2.3.26-incubating,Apache Software License 2.0.txt	
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/org.freemarker,freemarker,2.3.29,Apache Software License 2.0.txt	
@@ -203,12 +203,21 @@
 
 =========================================================================
 
-The Apache FreeMarker (incubating) source code contains the following
-binaries, which were created at the Apache FreeMarker (incubating)
-project, and hence are covered by the same license as the other source
-files of it:
+The source code contains the following binaries,
+which were created at the Apache FreeMarker project, and hence are
+covered by the same license as the other source files of it:
 
-    src/main/misc/overloadedNumberRules/prices.ods
-    src/manual/en_US/docgen-originals/figures/overview.odg
-
-=========================================================================
+  src/main/misc/overloadedNumberRules/prices.ods
+  src/manual/en_US/docgen-originals/figures/overview.odg
+  src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png
+  src/manual/en_US/docgen-originals/figures/tree_with_alpha.png
+  src/manual/en_US/favicon.png
+  src/manual/en_US/figures/model2sketch.png
+  src/manual/en_US/figures/overview.png
+  src/manual/en_US/figures/tree.png
+  src/manual/en_US/logo.png
+  src/manual/zh_CN/favicon.png
+  src/manual/zh_CN/figures/model2sketch.png
+  src/manual/zh_CN/figures/overview.png
+  src/manual/zh_CN/figures/tree.png
+  src/manual/zh_CN/logo.png
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
index a4d19f61c4..ce14d7d049 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
@@ -70,11 +70,11 @@
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
-      <version>2.3.26.incubating-redhat-3</version>
+      <version>2.3.29.redhat-00001</version>
       <licenses>
         <license>
           <name>Apache Software License 2.0</name>
-          <url>https://git-wip-us.apache.org/repos/asf?p=freemarker.git;a=blob_plain;f=LICENSE;hb=v2.3.26</url>
+          <url>https://git-wip-us.apache.org/repos/asf?p=freemarker.git;a=blob_plain;f=LICENSE;hb=v2.3.29</url>
         </license>
       </licenses>
     </dependency>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.26.incubating-redhat-3,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.29.redhat-00001,Apache Software License 2.0.txt
similarity index 93%
rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.26.incubating-redhat-3,Apache Software License 2.0.txt
rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.29.redhat-00001,Apache Software License 2.0.txt
index 7449e24287..1121ebaa2a 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.26.incubating-redhat-3,Apache Software License 2.0.txt	
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/org.freemarker,freemarker,2.3.29.redhat-00001,Apache Software License 2.0.txt	
@@ -203,12 +203,21 @@
 
 =========================================================================
 
-The Apache FreeMarker (incubating) source code contains the following
-binaries, which were created at the Apache FreeMarker (incubating)
-project, and hence are covered by the same license as the other source
-files of it:
+The source code contains the following binaries,
+which were created at the Apache FreeMarker project, and hence are
+covered by the same license as the other source files of it:
 
-    src/main/misc/overloadedNumberRules/prices.ods
-    src/manual/en_US/docgen-originals/figures/overview.odg
-
-=========================================================================
+  src/main/misc/overloadedNumberRules/prices.ods
+  src/manual/en_US/docgen-originals/figures/overview.odg
+  src/manual/en_US/docgen-originals/figures/model2sketch_with_alpha.png
+  src/manual/en_US/docgen-originals/figures/tree_with_alpha.png
+  src/manual/en_US/favicon.png
+  src/manual/en_US/figures/model2sketch.png
+  src/manual/en_US/figures/overview.png
+  src/manual/en_US/figures/tree.png
+  src/manual/en_US/logo.png
+  src/manual/zh_CN/favicon.png
+  src/manual/zh_CN/figures/model2sketch.png
+  src/manual/zh_CN/figures/overview.png
+  src/manual/zh_CN/figures/tree.png
+  src/manual/zh_CN/logo.png
diff --git a/pom.xml b/pom.xml
index 1c69afccf4..b89e7607b7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
         <apacheds.version>2.0.0-M21</apacheds.version>
         <apacheds.codec.version>1.0.0-M33</apacheds.codec.version>
         <google.zxing.version>3.2.1</google.zxing.version>
-        <freemarker.version>2.3.26-incubating</freemarker.version>
+        <freemarker.version>2.3.29</freemarker.version>
 
         <jetty9.version>${jetty92.version}</jetty9.version>
         <liquibase.version>3.5.5</liquibase.version>