diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index d1e265746..f57834fc5 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -39,6 +39,11 @@
 
     <properties>
 
+        <!--
+        The directory receiving the result of filtering applied to all files beneath src/main/webapp-templates.
+        -->
+        <generated.webapp.dir>${project.build.directory}/generated-resources/webapp-templates</generated.webapp.dir>
+
         <!--
         The location where temporary files should be stored for communicating
         between karma and firefox. The default location, /tmp, does not work
@@ -73,12 +78,55 @@
     <scm>
         <url>https://github.com/apache/guacamole-client</url>
         <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
-
     </scm>
 
     <build>
         <plugins>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+
+                    <!-- Filter any resources beneath src/main/webapp-templates -->
+                    <execution>
+                        <id>filter-webapp-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${generated.webapp.dir}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/webapp-templates</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+
+                    <!-- Include all other resources verbatim -->
+                    <execution>
+                        <id>copy-webapp-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${generated.webapp.dir}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/webapp</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+
+                </executions>
+            </plugin>
+
             <!-- Assemble JS files into single .zip -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -111,6 +159,8 @@
                             <charset>UTF-8</charset>
                             <jsEngine>CLOSURE</jsEngine>
 
+                            <webappSourceDir>${generated.webapp.dir}</webappSourceDir>
+
                             <jsSourceDir>/</jsSourceDir>
                             <jsTargetDir>/</jsTargetDir>
                             <jsFinalFile>all.js</jsFinalFile>
diff --git a/guacamole-common-js/src/main/webapp/modules/Version.js b/guacamole-common-js/src/main/webapp-templates/modules/Version.js
similarity index 96%
rename from guacamole-common-js/src/main/webapp/modules/Version.js
rename to guacamole-common-js/src/main/webapp-templates/modules/Version.js
index 3dfb5378b..b0e1ea839 100644
--- a/guacamole-common-js/src/main/webapp/modules/Version.js
+++ b/guacamole-common-js/src/main/webapp-templates/modules/Version.js
@@ -27,4 +27,4 @@ var Guacamole = Guacamole || {};
  *
  * @type {!string}
  */
-Guacamole.API_VERSION = "1.6.0";
+Guacamole.API_VERSION = "${project.version}";
diff --git a/guacamole-common-js/static.xml b/guacamole-common-js/static.xml
index ec8c17754..d17fe115c 100644
--- a/guacamole-common-js/static.xml
+++ b/guacamole-common-js/static.xml
@@ -25,7 +25,7 @@
     </formats>
     <fileSets>
         <fileSet>
-            <directory>src/main/webapp/modules/</directory>
+            <directory>${generated.webapp.dir}/modules/</directory>
             <includes>
                 <include>*.js</include>
             </includes>