diff --git a/src/build.xml b/src/build.xml
index bb77d70..34c8b32 100644
--- a/src/build.xml
+++ b/src/build.xml
@@ -10,7 +10,6 @@
         <pathelement location="${i2plib}/i2p.jar" />
         <pathelement location="${i2plib}/i2ptunnel.jar" />
         <pathelement location="${i2plib}/i2psnark.jar" />
-        <pathelement location="${i2plib}/routerconsole.jar" />
         <pathelement location="${jettylib}/ant.jar"/>
         <pathelement location="${jettylib}/org.mortbay.jetty.jar"/>
         <pathelement location="${jettylib}/jasper-compiler.jar" />
diff --git a/src/jsp/announce.jsp b/src/jsp/announce.jsp
index fb7fe1a..78c595c 100644
--- a/src/jsp/announce.jsp
+++ b/src/jsp/announce.jsp
@@ -50,11 +50,12 @@
 	// ignored, use someday to enforce destination
         String him = request.getHeader("X-I2P-DestB32");
         String xff = request.getHeader("X-Forwarded-For");
+        String xfs = request.getHeader("X-Forwarded-Server");
 
 	boolean fail = false;
 	String msg = "bad announce";
 
-	if (xff != null) {
+	if (xff != null || xfs != null) {
 		fail = true;
 		msg = "Non-I2P access denied";
 	        response.setStatus(403, msg);
diff --git a/src/jsp/scrape.jsp b/src/jsp/scrape.jsp
index 279a3ef..ce476cc 100644
--- a/src/jsp/scrape.jsp
+++ b/src/jsp/scrape.jsp
@@ -33,11 +33,12 @@
         response.setHeader("Pragma", "no-cache");
 	String info_hash = request.getParameter("info_hash");
         String xff = request.getHeader("X-Forwarded-For");
+        String xfs = request.getHeader("X-Forwarded-Server");
 
 	boolean fail = false;
 	String msg = "bad";
 
-	if (xff != null) {
+	if (xff != null || xfs != null) {
 		fail = true;
 		msg = "Non-I2P access denied";
 	        response.setStatus(403, msg);
diff --git a/src/jsp/seedless.jsp b/src/jsp/seedless.jsp
index 1d12256..2462971 100644
--- a/src/jsp/seedless.jsp
+++ b/src/jsp/seedless.jsp
@@ -28,6 +28,7 @@
 	// unused, we don't accept announces
 	String him = request.getHeader("X-I2P-DestB32");
         String xff = request.getHeader("X-Forwarded-For");
+        String xfs = request.getHeader("X-Forwarded-Server");
 
 	response.setContentType("text/plain");
 	response.setHeader("X-Seedless", me);
@@ -35,7 +36,7 @@
 	final int US_MINUTES = 360;
 	final int PEER_MINUTES = 60;
 
-	if (xff != null) {
+	if (xff != null || xfs != null) {
 		String msg = "Non-I2P access denied";
 	        response.setStatus(403, msg);
 		out.println(msg);