diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index 7923d98bb..94de8636a 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -87,7 +87,7 @@
 
                             <jsSourceDir>/</jsSourceDir>
                             <jsTargetDir>/</jsTargetDir>
-                            <jsFinalFile>guacamole.js</jsFinalFile>
+                            <jsFinalFile>all.js</jsFinalFile>
 
                             <jsSourceFiles>
                                 <jsSourceFile>common/license.js</jsSourceFile> 
diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml
index 7eac3c85f..16bf7ba2a 100644
--- a/guacamole/src/main/webapp/client.xhtml
+++ b/guacamole/src/main/webapp/client.xhtml
@@ -61,7 +61,7 @@
         <script type="text/javascript" src="scripts/lib/filesaver/filesaver.js"></script>
 
         <!-- guacamole-common-js -->
-        <script type="text/javascript" src="guacamole-common-js/guacamole.min.js"></script>
+        <script type="text/javascript" src="guacamole-common-js/all.min.js"></script>
 
         <!-- guacamole-default-webapp scripts -->
         <script type="text/javascript" src="scripts/session.js"></script>