diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
index 1de544c1f..4e96b6a5c 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
@@ -61,7 +61,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
     private static final String DEST32_HEADER = "X-I2P-DestB32";
     private static final String[] CLIENT_SKIPHEADERS = {HASH_HEADER, DEST64_HEADER, DEST32_HEADER};
     private static final String SERVER_HEADER = "Server";
-    private static final String[] SERVER_SKIPHEADERS = {SERVER_HEADER};
+    private static final String X_POWERED_BY_HEADER = "X-Powered-By";
+    private static final String[] SERVER_SKIPHEADERS = {SERVER_HEADER, X_POWERED_BY_HEADER};
     private static final long HEADER_TIMEOUT = 15*1000;
     private static final long TOTAL_HEADER_TIMEOUT = 2 * HEADER_TIMEOUT;
     private static final long START_INTERVAL = (60 * 1000) * 3;
diff --git a/history.txt b/history.txt
index bab17ff09..c3602f68e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2013-11-28 dg
+ * I2PTunnel: Don't send 'X-Forwarded-For' on HTTP server tunnels for anonymity reasons.
+
 2013-11-25 str4d
  * Reseed: Listen to "Require SSL" config option
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 2f2ab6ae7..eafd4d23d 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 35;
+    public final static long BUILD = 36;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";