diff --git a/zxing.appspot.com/war/Generator.css b/zxing.appspot.com/war/Generator.css
index 3675a34e4..0863aea39 100644
--- a/zxing.appspot.com/war/Generator.css
+++ b/zxing.appspot.com/war/Generator.css
@@ -93,7 +93,7 @@ body {
   background-color: #fffbcc;
 }
 .required {
-  background: #ffffff url(static/required-field-bg.png) repeat-y;
+  background: #ffffff url(/required-field-bg.png) repeat-y;
 }
 .errorMessage {
   padding-left: 110px;
diff --git a/zxing.appspot.com/war/Generator.html b/zxing.appspot.com/war/Generator.html
index 69c5a9bc5..20dae8af9 100644
--- a/zxing.appspot.com/war/Generator.html
+++ b/zxing.appspot.com/war/Generator.html
@@ -2,9 +2,9 @@
 <html>
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <link type="text/css" rel="stylesheet" href="Generator.css">
+    <link type="text/css" rel="stylesheet" href="/Generator.css">
     <title>QR Code Generator from the ZXing Project</title>
-    <script type="text/javascript" language="javascript" src="generator/generator.nocache.js"></script>
+    <script type="text/javascript" language="javascript" src="/generator/generator.nocache.js"></script>
   </head>
   <body>
     <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe>
diff --git a/zxing.appspot.com/war/WEB-INF/appengine-web.xml b/zxing.appspot.com/war/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..d86418ea8
--- /dev/null
+++ b/zxing.appspot.com/war/WEB-INF/appengine-web.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>zxing</application>
+  <version>2</version>
+</appengine-web-app>
\ No newline at end of file
diff --git a/zxing.appspot.com/war/app.yaml b/zxing.appspot.com/war/app.yaml
index ae465bf80..d566cc31d 100644
--- a/zxing.appspot.com/war/app.yaml
+++ b/zxing.appspot.com/war/app.yaml
@@ -8,14 +8,58 @@ handlers:
   static_files: Generator.html
   upload: Generator.html
 
+- url: /generator/
+  static_files: Generator.html
+  upload: Generator.html
+
 - url: /scan
   static_files: scan.html
   upload: scan.html
 
+- url: /scan/
+  static_files: scan.html
+  upload: scan.html
+
 - url: /
   static_files: index.html
   upload: index.html
 
-- url: /(.*)
-  static_files: \1
-  upload: /
\ No newline at end of file
+- url: /favicon.ico
+  static_files: favicon.ico
+  upload: favicon.ico
+
+- url: /Generator.css
+  static_files: Generator.css
+  upload: Generator.css
+
+- url: /Generator.html
+  static_files: Generator.html
+  upload: Generator.html
+
+- url: /index.html
+  static_files: index.html
+  upload: index.html
+
+- url: /required-field-bg.png
+  static_files: required-field-bg.png
+  upload: required-field-bg.png
+
+- url: /scan.html
+  static_files: scan.html
+  upload: scan.html
+
+- url: /style.css
+  static_files: style.css
+  upload: style.css
+
+- url: /zxingicon.png
+  static_files: zxingicon.png
+  upload: zxingicon.png
+
+- url: /zxingiconsmall.png
+  static_files: zxingiconsmall.png
+  upload: zxingiconsmall.png
+
+- url: /generator/(.*)
+  static_files: generator/\1
+  upload: generator/(.*)
diff --git a/zxing.appspot.com/war/index.html b/zxing.appspot.com/war/index.html
index 9a385792e..c0c51a606 100644
--- a/zxing.appspot.com/war/index.html
+++ b/zxing.appspot.com/war/index.html
@@ -4,7 +4,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <title>Zebra Crossing</title>
-    <link rel="stylesheet" href="style.css" type="text/css"/>
+    <link rel="stylesheet" href="/style.css" type="text/css"/>
   </head>
 
   <body>
@@ -15,11 +15,11 @@
     <table width="600" cellpadding="4" cellspacing="8">
       <tr>
         <td valign="top">
-          <img src="zxingicon.png" width="128" height="128"/>
+          <img src="/zxingicon.png" width="128" height="128"/>
         </td>
         <td valign="top">
           <p>Welcome to the Zebra Crossing site at zxing.appspot.com.</p>
-          <p> This site features a <a href="generator">QR Code Generator</a>, which
+          <p> This site features a <a href="/generator">QR Code Generator</a>, which
           allows you to create a two-dimensional barcode that can be scanned
           with a camera phone. These QR Codes can contain a URL, contact
           information, a calendar event, and much more.</p>
diff --git a/zxing.appspot.com/war/scan.html b/zxing.appspot.com/war/scan.html
index c9a3ebbde..7362ddf68 100644
--- a/zxing.appspot.com/war/scan.html
+++ b/zxing.appspot.com/war/scan.html
@@ -4,7 +4,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <title>Zebra Crossing</title>
-    <link rel="stylesheet" href="style.css" type="text/css"/>
+    <link rel="stylesheet" href="/style.css" type="text/css"/>
   </head>
 
   <body>
@@ -15,7 +15,7 @@
     <table cellpadding="4" cellspacing="8">
       <tr>
         <td valign="top">
-          <img src="zxingiconsmall.png" width="48" height="48"/>
+          <img src="/zxingiconsmall.png" width="48" height="48"/>
         </td>
         <td valign="top">
           <p>A web page you are viewing would like to scan a barcode with your camera phone. To do
