diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index b149d29aa..7923d98bb 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -72,31 +72,37 @@
                 </executions>
             </plugin>
 
-            <!-- Combine all .js into single aggregate -->
+            <!-- JS/CSS Minification Plugin -->
             <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>yuicompressor-maven-plugin</artifactId>
-                <version>1.3.0</version>
+                <groupId>com.samaxes.maven</groupId>
+                <artifactId>minify-maven-plugin</artifactId>
+                <version>1.6.1</version>
                 <executions>
                     <execution>
+                        <id>default-minify</id>
+                        <configuration>
+
+                            <charset>UTF-8</charset>
+                            <jsEngine>CLOSURE</jsEngine>
+
+                            <jsSourceDir>/</jsSourceDir>
+                            <jsTargetDir>/</jsTargetDir>
+                            <jsFinalFile>guacamole.js</jsFinalFile>
+
+                            <jsSourceFiles>
+                                <jsSourceFile>common/license.js</jsSourceFile> 
+                            </jsSourceFiles>
+
+                            <jsSourceIncludes>
+                                <jsSourceInclude>modules/**/*.js</jsSourceInclude>
+                            </jsSourceIncludes>
+
+                        </configuration>
                         <goals>
-                            <goal>compress</goal>
+                            <goal>minify</goal>
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <nosuffix>true</nosuffix>
-                    <jswarn>false</jswarn>
-                    <aggregations>
-                        <aggregation>
-                            <output>${project.build.directory}/guacamole.js</output>
-                            <includes>
-                                <include>${basedir}/src/main/resources/common/license.js</include>
-                                <include>**/*.js</include>
-                            </includes>
-                        </aggregation>
-                    </aggregations>
-                </configuration>
             </plugin>
 
         </plugins>
diff --git a/guacamole-common-js/src/main/resources/common/license.js b/guacamole-common-js/src/main/webapp/common/license.js
similarity index 94%
rename from guacamole-common-js/src/main/resources/common/license.js
rename to guacamole-common-js/src/main/webapp/common/license.js
index c6c47cc5c..2d7de929b 100644
--- a/guacamole-common-js/src/main/resources/common/license.js
+++ b/guacamole-common-js/src/main/webapp/common/license.js
@@ -1,3 +1,5 @@
+/*! (C) 2014 Glyptodon LLC - glyptodon.org/MIT-LICENSE */
+
 /*
  * Copyright (C) 2013 Glyptodon LLC
  *
diff --git a/guacamole-common-js/src/main/resources/modules/AudioChannel.js b/guacamole-common-js/src/main/webapp/modules/AudioChannel.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/AudioChannel.js
rename to guacamole-common-js/src/main/webapp/modules/AudioChannel.js
diff --git a/guacamole-common-js/src/main/resources/modules/Client.js b/guacamole-common-js/src/main/webapp/modules/Client.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/Client.js
rename to guacamole-common-js/src/main/webapp/modules/Client.js
diff --git a/guacamole-common-js/src/main/resources/modules/InputStream.js b/guacamole-common-js/src/main/webapp/modules/InputStream.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/InputStream.js
rename to guacamole-common-js/src/main/webapp/modules/InputStream.js
diff --git a/guacamole-common-js/src/main/resources/modules/IntegerPool.js b/guacamole-common-js/src/main/webapp/modules/IntegerPool.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/IntegerPool.js
rename to guacamole-common-js/src/main/webapp/modules/IntegerPool.js
diff --git a/guacamole-common-js/src/main/resources/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/Keyboard.js
rename to guacamole-common-js/src/main/webapp/modules/Keyboard.js
diff --git a/guacamole-common-js/src/main/resources/modules/Layer.js b/guacamole-common-js/src/main/webapp/modules/Layer.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/Layer.js
rename to guacamole-common-js/src/main/webapp/modules/Layer.js
diff --git a/guacamole-common-js/src/main/resources/modules/Mouse.js b/guacamole-common-js/src/main/webapp/modules/Mouse.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/Mouse.js
rename to guacamole-common-js/src/main/webapp/modules/Mouse.js
diff --git a/guacamole-common-js/src/main/resources/modules/OnScreenKeyboard.js b/guacamole-common-js/src/main/webapp/modules/OnScreenKeyboard.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/OnScreenKeyboard.js
rename to guacamole-common-js/src/main/webapp/modules/OnScreenKeyboard.js
diff --git a/guacamole-common-js/src/main/resources/modules/OutputStream.js b/guacamole-common-js/src/main/webapp/modules/OutputStream.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/OutputStream.js
rename to guacamole-common-js/src/main/webapp/modules/OutputStream.js
diff --git a/guacamole-common-js/src/main/resources/modules/Parser.js b/guacamole-common-js/src/main/webapp/modules/Parser.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/Parser.js
rename to guacamole-common-js/src/main/webapp/modules/Parser.js
diff --git a/guacamole-common-js/src/main/resources/modules/Tunnel.js b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
similarity index 100%
rename from guacamole-common-js/src/main/resources/modules/Tunnel.js
rename to guacamole-common-js/src/main/webapp/modules/Tunnel.js
diff --git a/guacamole-common-js/static.xml b/guacamole-common-js/static.xml
index 99bfd25eb..e88abdce0 100644
--- a/guacamole-common-js/static.xml
+++ b/guacamole-common-js/static.xml
@@ -6,14 +6,14 @@
     </formats>
     <fileSets>
         <fileSet>
-            <directory>src/main/resources/modules/</directory>
+            <directory>src/main/webapp/modules/</directory>
             <includes>
                 <include>*.js</include>
             </includes>
-            <outputDirectory></outputDirectory>
+            <outputDirectory>modules/</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>target/</directory>
+            <directory>target/${project.name}-${project.version}/</directory>
             <includes>
                 <include>*.js</include>
             </includes>