diff --git a/commons/tool/pom.xml b/commons/tool/pom.xml
index 44bd8b49188d..3f6b6906c32b 100644
--- a/commons/tool/pom.xml
+++ b/commons/tool/pom.xml
@@ -86,7 +86,7 @@
             <plugin>
                 <groupId>com.github.jknack</groupId>
                 <artifactId>handlebars-maven-plugin</artifactId>
-                <version>4.0.5</version>
+                <version>${handlebars4.version}</version>
                 <executions>
                     <execution>
                         <id>templates</id>
diff --git a/feedback/pom.xml b/feedback/pom.xml
index 264ea049a25f..271f7c50928c 100644
--- a/feedback/pom.xml
+++ b/feedback/pom.xml
@@ -120,7 +120,7 @@
                     <plugin>
                         <groupId>com.github.jknack</groupId>
                         <artifactId>handlebars-maven-plugin</artifactId>
-                        <version>1.3.1</version>
+                        <version>${handlebars1.version}</version>
                         <executions>
                             <execution>
                                 <id>precompile</id>
@@ -156,7 +156,7 @@
             <plugin>
                 <groupId>com.github.jknack</groupId>
                 <artifactId>handlebars-maven-plugin</artifactId>
-                <version>1.3.1</version>
+                <version>${handlebars1.version}</version>
                 <executions>
                     <execution>
                         <id>precompile</id>
diff --git a/library/pom.xml b/library/pom.xml
index e540c38c474b..5d6223928fac 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -82,7 +82,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>handlebars</artifactId>
-			<version>4.0.5</version>
+			<version>${handlebars4.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
diff --git a/master/pom.xml b/master/pom.xml
index c53015c31249..2a98cf3c65e7 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -133,7 +133,9 @@
     <sakai.genericdao.version>0.11.0</sakai.genericdao.version>
     <reflectutils.version>0.9.20</reflectutils.version>
     <json.simple.version>1.1.1</json.simple.version>
-    <handlebars.version>2.1.0</handlebars.version>
+    <handlebars1.version>1.3.1</handlebars1.version>
+    <handlebars2.version>2.1.0</handlebars2.version>
+    <handlebars4.version>4.0.6</handlebars4.version>
     <jdom.version>1.0</jdom.version>
     <hamcrest.all.version>1.3</hamcrest.all.version>
     <junit.version>4.11</junit.version>
diff --git a/pasystem/pasystem-impl/impl/pom.xml b/pasystem/pasystem-impl/impl/pom.xml
index 60aaa1bd8329..76e7368c2722 100644
--- a/pasystem/pasystem-impl/impl/pom.xml
+++ b/pasystem/pasystem-impl/impl/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.github.jknack</groupId>
       <artifactId>handlebars</artifactId>
-      <version>4.0.6</version>
+      <version>${handlebars4.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/pasystem/pasystem-tool/tool/pom.xml b/pasystem/pasystem-tool/tool/pom.xml
index 588e0aeade5b..3fac3e781c6a 100644
--- a/pasystem/pasystem-tool/tool/pom.xml
+++ b/pasystem/pasystem-tool/tool/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.github.jknack</groupId>
       <artifactId>handlebars</artifactId>
-      <version>4.0.6</version>
+      <version>${handlebars4.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm
index f82a99c0c05a..b5de3dbf5bf8 100755
--- a/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm
+++ b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm
@@ -125,7 +125,7 @@
 
         <script>
             if (typeof Handlebars == 'undefined') {
-                document.write('\x3Cscript src="${pageWebjarsPath}handlebars/4.0.5/handlebars.runtime.min.js$!{portalCDNQuery}">\x3C/script>');
+                document.write('\x3Cscript src="${pageWebjarsPath}handlebars/4.0.6/handlebars.runtime.min.js$!{portalCDNQuery}">\x3C/script>');
             }
         </script>
         <script src="/library/templates.js$!{portalCDNQuery}"></script>
diff --git a/roster2/pom.xml b/roster2/pom.xml
index 6047b5ced65d..74901c255218 100644
--- a/roster2/pom.xml
+++ b/roster2/pom.xml
@@ -228,7 +228,7 @@
             <plugin>
                 <groupId>com.github.jknack</groupId>
                 <artifactId>handlebars-maven-plugin</artifactId>
-                <version>4.0.5</version>
+                <version>${handlebars4.version}</version>
                 <executions>
                     <execution>
                         <id>precompile</id>
diff --git a/roster2/src/webapp/WEB-INF/bootstrap.jsp b/roster2/src/webapp/WEB-INF/bootstrap.jsp
index 0b9d84afdb77..cc406720b315 100644
--- a/roster2/src/webapp/WEB-INF/bootstrap.jsp
+++ b/roster2/src/webapp/WEB-INF/bootstrap.jsp
@@ -86,7 +86,7 @@
 <script type="text/javascript" src="/library/webjars/jquery-migrate/1.4.1/jquery-migrate.min.js"></script>
 <script type="text/javascript" src="/sakai-roster2-tool/lib/jquery.waitforimages.min.js"></script>
 <script type="text/javascript" src="/profile2-tool/javascript/profile2-eb.js"></script>
-<script type="text/javascript" src="/library/webjars/handlebars/4.0.5/handlebars.runtime.min.js"></script>
+<script type="text/javascript" src="/library/webjars/handlebars/4.0.6/handlebars.runtime.min.js"></script>
 <script type="text/javascript" src="/sakai-roster2-tool/templates.js"></script>
 <script type="text/javascript" src="/sakai-roster2-tool/lib/sakai_utils.js"></script>
 <script type="text/javascript" src="/sakai-roster2-tool/js/roster_permissions.js"></script>
diff --git a/tags/tags-impl/impl/pom.xml b/tags/tags-impl/impl/pom.xml
index 1d4e13384cd5..ab6409d5514e 100644
--- a/tags/tags-impl/impl/pom.xml
+++ b/tags/tags-impl/impl/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.github.jknack</groupId>
       <artifactId>handlebars</artifactId>
-      <version>${handlebars.version}</version>
+      <version>${handlebars2.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/tags/tags-tool/tool/pom.xml b/tags/tags-tool/tool/pom.xml
index d283231d7ee8..dfe5ba48b59b 100644
--- a/tags/tags-tool/tool/pom.xml
+++ b/tags/tags-tool/tool/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.github.jknack</groupId>
       <artifactId>handlebars</artifactId>
-      <version>${handlebars.version}</version>
+      <version>${handlebars2.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>