diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index d0735c9d5..798e82fc0 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -281,6 +281,15 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                         line = "Host: " + host;
                         if (_log.shouldLog(Log.INFO)) 
                             _log.info(getPrefix(requestId) + "Setting host = " + host);
+                    } else if (line.startsWith("User-Agent: ")) {
+                        line = "User-Agent: MYOB/6.66 (AN/ON)";
+                    } else if (line.startsWith("Referer: ")) {
+                        // Shouldn't we be more specific, like accepting in-site referers ?
+                        line = "Referer: i2p";
+                    } else if (line.startsWith("Via: ")) {
+                        line = "Via: i2p";
+                    } else if (line.startsWith("From: ")) {
+                        line = "From: i2p";
                     }
                 }
                 
diff --git a/history.txt b/history.txt
index 0bdc423cb..bfd3d1765 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,12 @@
-$Id: history.txt,v 1.1 2004/09/02 15:00:28 jrandom Exp $
+$Id: history.txt,v 1.2 2004/09/02 16:26:03 jrandom Exp $
+
+2004-09-03  oOo
+    * Added some filters to the HTTP request, replacing the User-Agent,
+      Referrer, Via, and From headers, which helps until we have a more 
+      comprehensive filtering system.
+
+2004-09-03  jrandom
+    * Disabled the old listener on port 7655.
 
 2004-09-02  jrandom
     * Cleaned up the base build.xml, adding a new target ("updater") which 
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index b11642948..ac08e216b 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -168,7 +168,7 @@ public class Router {
         _context.jobQueue().addJob(new UpdateRoutingKeyModifierJob());
         warmupCrypto();
         _sessionKeyPersistenceHelper.startup();
-        _context.adminManager().startup();
+        //_context.adminManager().startup();
         _context.jobQueue().addJob(new StartupJob(_context));
     }
     
@@ -540,7 +540,7 @@ public class Router {
         _isAlive = false;
         I2PThread.removeOOMEventListener(_oomListener);
         try { _context.jobQueue().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the job queue", t); }
-        try { _context.adminManager().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the admin manager", t); }        
+        //try { _context.adminManager().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the admin manager", t); }        
         try { _context.statPublisher().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the stats manager", t); }
         try { _context.clientManager().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the client manager", t); }
         try { _context.tunnelManager().shutdown(); } catch (Throwable t) { _log.log(Log.CRIT, "Error shutting down the tunnel manager", t); }
@@ -657,7 +657,7 @@ public class Router {
         _isAlive = false;
         
         try { _context.commSystem().restart(); } catch (Throwable t) { _log.log(Log.CRIT, "Error restarting the comm system", t); }
-        try { _context.adminManager().restart(); } catch (Throwable t) { _log.log(Log.CRIT, "Error restarting the client manager", t); }
+        //try { _context.adminManager().restart(); } catch (Throwable t) { _log.log(Log.CRIT, "Error restarting the client manager", t); }
         try { _context.clientManager().restart(); } catch (Throwable t) { _log.log(Log.CRIT, "Error restarting the client manager", t); }
         try { _context.tunnelManager().restart(); } catch (Throwable t) { _log.log(Log.CRIT, "Error restarting the tunnel manager", t); }
         try { _context.peerManager().restart(); } catch (Throwable t) { _log.log(Log.CRIT, "Error restarting the peer manager", t); }
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 3c003c587..0a1277d70 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.18 $ $Date: 2004/09/02 15:00:28 $";
+    public final static String ID = "$Revision: 1.19 $ $Date: 2004/09/02 16:26:03 $";
     public final static String VERSION = "0.3.4.3";
-    public final static long BUILD = 1;
+    public final static long BUILD = 2;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);