diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTServletModule.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTServletModule.java
index a6e54c7a6..34bfb0790 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTServletModule.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTServletModule.java
@@ -27,6 +27,8 @@ import com.google.inject.matcher.Matchers;
 import com.google.inject.servlet.ServletModule;
 import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
 import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
+import org.glyptodon.guacamole.net.basic.resource.ResourceServlet;
+import org.glyptodon.guacamole.net.basic.resource.WebApplicationResource;
 import org.glyptodon.guacamole.net.basic.rest.auth.TokenRESTService;
 import org.glyptodon.guacamole.net.basic.rest.clipboard.ClipboardRESTService;
 import org.glyptodon.guacamole.net.basic.rest.connection.ConnectionRESTService;
@@ -71,6 +73,10 @@ public class RESTServletModule extends ServletModule {
         bind(JacksonJsonProvider.class).in(Scopes.SINGLETON);
         serve("/api/*").with(GuiceContainer.class);
 
+        // TODO: Pull these from extensions, dynamically concatenated
+        serve("/app.js").with(new ResourceServlet(new WebApplicationResource(getServletContext(), "/guacamole.min.js")));
+        serve("/app.css").with(new ResourceServlet(new WebApplicationResource(getServletContext(), "/guacamole.min.css")));
+
     }
 
 }
diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html
index eb6d28dad..3303ec1a8 100644
--- a/guacamole/src/main/webapp/index.html
+++ b/guacamole/src/main/webapp/index.html
@@ -8,7 +8,7 @@
         <link rel="icon" type="image/png" href="images/guacamole-logo-64.png"/>
         <link rel="icon" type="image/png" sizes="144x144" href="images/guacamole-logo-144.png"/>
         <link rel="apple-touch-icon" type="image/png" href="images/guacamole-logo-144.png"/>
-        <link rel="stylesheet" type="text/css" href="guacamole.min.css">
+        <link rel="stylesheet" type="text/css" href="app.css">
         <title ng-bind="page.title | translate"></title>
     </head>
     <!--
@@ -52,6 +52,6 @@
         <!-- Login screen for logged-out users -->
         <guac-login ng-show="expectedCredentials" form="expectedCredentials"></guac-login>
         
-        <script type="text/javascript" src="guacamole.min.js"></script>
+        <script type="text/javascript" src="app.js"></script>
     </body>
 </html>