diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java b/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
index b357bb57c..8de96acdb 100644
--- a/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
+++ b/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
@@ -24,23 +24,23 @@ import net.sourceforge.guacamole.GuacamoleException;
 
 public class GuacamoleConfiguration extends Configuration {
 
-    private String hostname;
-    private int port;
+    private String guacd_hostname;
+    private int guacd_port;
 
     public GuacamoleConfiguration(ServletContext context) throws GuacamoleException {
 
         super(context);
 
-        hostname       = context.getInitParameter("hostname");
-        port           = readIntParameter("port", null);
+        guacd_hostname       = context.getInitParameter("guacd-hostname");
+        guacd_port           = readIntParameter("guacd-port", null);
 
     }
 
-    public int getPort() {
-        return port;
+    public int getProxyPort() {
+        return guacd_port;
     }
 
-    public String getHostname() {
-        return hostname;
+    public String getProxyHostname() {
+        return guacd_hostname;
     }
 }
diff --git a/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleSession.java b/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleSession.java
index b97931d6a..81b3a5636 100644
--- a/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleSession.java
+++ b/guacamole/web-client/src/net/sourceforge/guacamole/net/GuacamoleSession.java
@@ -96,8 +96,8 @@ public class GuacamoleSession {
 
             client = new SessionClient(
                     new GuacamoleClient (
-                        config.getHostname(),
-                        config.getPort()
+                        config.getProxyHostname(),
+                        config.getProxyPort()
                     )
             );
 
diff --git a/guacamole/web-client/web/META-INF/context.xml b/guacamole/web-client/web/META-INF/context.xml
index 5bee3dc30..c63f9b865 100644
--- a/guacamole/web-client/web/META-INF/context.xml
+++ b/guacamole/web-client/web/META-INF/context.xml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path=""/>
+<Context antiJARLocking="true" path="">
+
+    <!-- Hostname and port of guacamole proxy -->
+    <Parameter name="guacd-hostname" value="localhost"/>
+    <Parameter name="guacd-port"     value="4822"/>
+
+</Context>
diff --git a/guacamole/web-client/web/WEB-INF/web.xml b/guacamole/web-client/web/WEB-INF/web.xml
index e26ab78b9..0be425c7f 100644
--- a/guacamole/web-client/web/WEB-INF/web.xml
+++ b/guacamole/web-client/web/WEB-INF/web.xml
@@ -17,9 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
+    
     <!-- Basic config -->
-
+    
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>
@@ -29,9 +29,19 @@
 			30
         </session-timeout>
     </session-config>
-
+    
     <!-- Servlets -->
 
+    <servlet>
+        <description>Connect servlet.</description>
+        <servlet-name>Connect</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.tunnel.Connect</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Connect</servlet-name>
+        <url-pattern>/connect</url-pattern>
+    </servlet-mapping>
+   
     <servlet>
         <description>Outbound servlet.</description>
         <servlet-name>Outbound</servlet-name>
@@ -41,7 +51,7 @@
         <servlet-name>Outbound</servlet-name>
         <url-pattern>/outbound</url-pattern>
     </servlet-mapping>
-
+    
     <servlet>
         <description>Input servlet.</description>
         <servlet-name>Inbound</servlet-name>
@@ -51,5 +61,5 @@
         <servlet-name>Inbound</servlet-name>
         <url-pattern>/inbound</url-pattern>
     </servlet-mapping>
-
+    
 </web-app>