diff --git a/plugins/org.jboss.ide.eclipse.freemarker/.classpath b/plugins/org.jboss.ide.eclipse.freemarker/.classpath
index ba6a774..704341c 100755
--- a/plugins/org.jboss.ide.eclipse.freemarker/.classpath
+++ b/plugins/org.jboss.ide.eclipse.freemarker/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="freemarker-2.3.18.jar"/>
+	<classpathentry exported="true" kind="lib" path="freemarker-2.3.21.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF b/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF
index d31a0de..9443dac 100755
--- a/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.ide.eclipse.freemarker/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
  org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- freemarker-2.3.18.jar
+ freemarker-2.3.21.jar
 Bundle-Vendor: %providerName
 Export-Package: freemarker.core,
  freemarker.template,
diff --git a/plugins/org.jboss.ide.eclipse.freemarker/build.properties b/plugins/org.jboss.ide.eclipse.freemarker/build.properties
index f30bb94..16bfa63 100755
--- a/plugins/org.jboss.ide.eclipse.freemarker/build.properties
+++ b/plugins/org.jboss.ide.eclipse.freemarker/build.properties
@@ -1,6 +1,6 @@
 jars.compile.order = .
 bin.includes = plugin.*,\
-               freemarker-2.3.18.jar,\
+               freemarker-2.3.21.jar,\
                META-INF/,\
                .,\
                icons/,\
@@ -10,6 +10,6 @@ bin.includes = plugin.*,\
 src.includes = plugin.*,\
                icons/,\
                License.txt,\
-               freemarker-2.3.18.jar
+               freemarker-2.3.21.jar
 source.. = src/
 output.. = bin/
diff --git a/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.18.jar b/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.18.jar
deleted file mode 100755
index b3673e2..0000000
Binary files a/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.18.jar and /dev/null differ
diff --git a/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.21.jar b/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.21.jar
new file mode 100644
index 0000000..b506f8f
Binary files /dev/null and b/plugins/org.jboss.ide.eclipse.freemarker/freemarker-2.3.21.jar differ