diff --git a/USERGUIDE.md b/USERGUIDE.md
index a4a85a44..2efc44b4 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -9,6 +9,7 @@ table of contents:
 - [Map Status / Updates](#map-status--updates)
 - [Sidebar](#sidebar)
 - [Bugs and help requests](#reporting-bugs--i-need-more-help)
+- [Nightly Builds](#nightly-builds)
 
 
 Installation
@@ -156,3 +157,9 @@ Reporting Bugs / I need more help
 ---------------------------------
 
 [Please read the “how do I report bugs” here](https://github.com/breunigs/ingress-intel-total-conversion/blob/gh-pages/HACKING.md#how-do-i-report-bugs).
+
+
+Nightly Builds
+--------------
+
+You can always find the latest nightly build under this URL: [https://iitcserv.appspot.com/iitc-nightly/iitc-nightly-latest.user.js](https://iitcserv.appspot.com/iitc-nightly/iitc-nightly-latest.user.js). Note that it does *not* update to nightly, but to the next release version instead. In other words, you are always lead back to main unless you manually install the nightly version each time. [You can find older nightly builds in the same folder](https://iitcserv.appspot.com/iitc-nightly/), which may be useful if you want to track down when something broke for you (called “bisecting”).
diff --git a/tools/appengine/war/WEB-INF/appengine-web.xml b/tools/appengine/war/WEB-INF/appengine-web.xml
index 1e1734da..d928ccd2 100644
--- a/tools/appengine/war/WEB-INF/appengine-web.xml
+++ b/tools/appengine/war/WEB-INF/appengine-web.xml
@@ -3,10 +3,11 @@
   <version>1</version>
 
   <static-files>
-    <include path="/**.png" expiration="7d" />
+    <include path="/**.png" expiration="7d"/>
     <include path="/**.css" expiration="2d"/>
     <include path="/**.js" expiration="7d"/>
     <include path="/iitc-nightly/iitc-nightly-latest.user.js.js" expiration="12h"/>
+    <include path="/iitc-nightly/**"/>
   </static-files>
   <threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/tools/appengine/war/WEB-INF/web.xml b/tools/appengine/war/WEB-INF/web.xml
index 029e4c77..b5c34bad 100644
--- a/tools/appengine/war/WEB-INF/web.xml
+++ b/tools/appengine/war/WEB-INF/web.xml
@@ -1,2 +1,23 @@
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+  <context-param>
+    <param-name>org.mortbay.jetty.servlet.Default.dirAllowed</param-name>
+    <param-value>true</param-value>
+  </context-param>
+
+  <servlet>
+    <servlet-name>default</servlet-name>
+    <servlet-class>org.mortbay.jetty.servlet.DefaultServlet</servlet-class>
+    <init-param>
+      <param-name>acceptRanges</param-name><param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>dirAllowed</param-name><param-value>true</param-value>
+    </init-param>
+    <load-on-startup>0</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>/iitc-nightly/*</url-pattern>
+ </servlet-mapping>
 </web-app>