diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index c486cb377..666cad9c8 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -1097,7 +1097,11 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                 out.write("\">http://".getBytes());
                 out.write(uri.getBytes());
                 out.write("</a>".getBytes());
-                if (usingWWWProxy) out.write(("<br>WWW proxy: " + wwwProxy).getBytes());
+                if (usingWWWProxy) {
+                    out.write(("<br><br><b>").getBytes());
+                    out.write(_("HTTP Outproxy").getBytes("UTF-8"));
+                    out.write((":</b> " + wwwProxy).getBytes());
+                }
                 if (jumpServers != null && jumpServers.length() > 0) {
                     out.write("<br><br>".getBytes());
                     out.write(_("Click a link below to look for an address helper by using a \"jump\" service:").getBytes("UTF-8"));
diff --git a/history.txt b/history.txt
index d53138876..084cd1c5c 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,11 @@
+2011-11-02 zzz
+  * HTTP Proxy: Error page tweak
+  * Reseed:
+    - Add new host
+    - Handle % escaping in file URLs
+    - Do basic validation of router hash
+    - Add some more sanity checks
+
 2011-11-01 kytv
   * Update Ukrainian translations from Transifex
   * Update i2prouter script for better compatibility with Gentoo
diff --git a/installer/resources/proxy/dnfp-header.ht b/installer/resources/proxy/dnfp-header.ht
index 9f627bb8d..b742c1499 100644
--- a/installer/resources/proxy/dnfp-header.ht
+++ b/installer/resources/proxy/dnfp-header.ht
@@ -15,8 +15,8 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Addressbook</a>
 </div>
 <div class=warning id=warning>
-<h3>Warning: I2P Proxy Not Found</h3>
-The WWW Outproxy was not found. 
+<h3>Warning: Outproxy Not Found</h3>
+The HTTP Outproxy was not found. 
 It is offline, there is network congestion,
 or your router is not yet well-integrated with peers.
 You may want to 
diff --git a/installer/resources/proxy/dnfp-header_de.ht b/installer/resources/proxy/dnfp-header_de.ht
index 38df4261b..e7e37009d 100644
--- a/installer/resources/proxy/dnfp-header_de.ht
+++ b/installer/resources/proxy/dnfp-header_de.ht
@@ -16,7 +16,7 @@ Proxy-Connection: close
 </div>
 <div class=warning id=warning>
 <h3>Warnung: I2P-Proxy nicht gefunden</h3>
-Der WWW-Outproxy wurde nicht gefunden.
+Der HTTP-Outproxy wurde nicht gefunden.
 Er ist offline, das Netz überlastet oder verstopft,
 oder Ihr Router ist noch nicht gut ins Netzwerk integriert.
 Laden Sie die Seite <a href="javascript: parent.window.location.reload()">neu</a>! 
diff --git a/installer/resources/proxy/dnfp-header_nl.ht b/installer/resources/proxy/dnfp-header_nl.ht
index 293900d92..2cf8cc560 100644
--- a/installer/resources/proxy/dnfp-header_nl.ht
+++ b/installer/resources/proxy/dnfp-header_nl.ht
@@ -15,8 +15,8 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">Configuratie</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Adresboek</a>
 </div>
 <div class=warning id=warning>
-<h3>Waarschuwing: I2P Proxy Niet Gevonden</h3>
-De WWW Outproxy was niet gevonden.
+<h3>Waarschuwing: Outproxy Niet Gevonden</h3>
+De HTTP Outproxy was niet gevonden.
 Het is offline, er is een netwerk verstopping,
 of je router is niet goed geïntegreerd met peers.
 Probeer <a href="javascript: parent.window.location.reload()">opnieuw</a>
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 4e28a2c8d..ae4c8ac3a 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 5;
+    public final static long BUILD = 6;
 
     /** for example "-test" */
-    public final static String EXTRA = "";
+    public final static String EXTRA = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);