diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index d30a0bda0..b4bf0f039 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -29,6 +29,16 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
+                    
+                    <!-- Filter webapp dir --> 
+                    <webResources>
+                        <resource>
+                            <directory>src/main/webapp</directory>
+                            <filtering>true</filtering>
+                        </resource>
+                    </webResources>
+                    
+                    <!-- Add guacamole-common-js -->
                     <overlays>
                         <overlay>
                             <groupId>net.sourceforge.guacamole</groupId>
@@ -36,6 +46,7 @@
                             <type>zip</type>
                         </overlay>
                     </overlays>
+                    
                 </configuration>
             </plugin>
 
diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html
index cd0cf2bee..6bd09bd80 100644
--- a/guacamole/src/main/webapp/index.html
+++ b/guacamole/src/main/webapp/index.html
@@ -57,9 +57,12 @@
                         <div id="buttons">
                             <input type="submit" name="login" id="login" value="Login"/>
                         </div>
+
                     </form>
                 </div>
 
+                <div id="version-dialog">Guacamole ${project.version}</div>
+
             </div>
         </div>
 
@@ -83,7 +86,7 @@
                 <button id="CtrlAltDelete">Ctrl-Alt-Delete</button>
 
                 <!-- Logo and status -->
-                <img id="logo" src="images/guacamole-logo.png" alt="Guacamole" title="Guacamole 0.4.0"/>
+                <img id="logo" src="images/guacamole-logo.png" alt="Guacamole" title="Guacamole ${project.version}"/>
                 <span id="state"></span>
 
                 <a href="agpl-3.0-standalone.html"><img id="license" src="images/agpl-logo.png" alt="AGPLv3"/></a>
diff --git a/guacamole/src/main/webapp/styles/guacamole.css b/guacamole/src/main/webapp/styles/guacamole.css
index 6f2b9a3f2..9f9c6125f 100644
--- a/guacamole/src/main/webapp/styles/guacamole.css
+++ b/guacamole/src/main/webapp/styles/guacamole.css
@@ -92,6 +92,17 @@ div#login-dialog #login-fields {
     padding-bottom: 0.5em;
 }
 
+div#login-ui #version-dialog {
+    position: fixed;
+    right: 0;
+    bottom: 0;
+    text-align: right;
+    font-style: italic;
+    font-size: 0.75em;
+    color: black;
+    padding: 0.25em;
+}
+
 div.errorDialogOuter {
     display: table;
     height: 100%;
@@ -185,7 +196,6 @@ img {
 }
 
 img#license {
-    border: none;
     float: right;
     margin: 2px;
 }