diff --git a/apps/i2ptunnel/jsp/edit.jsp b/apps/i2ptunnel/jsp/edit.jsp
index e35f23c0f..236e600f0 100644
--- a/apps/i2ptunnel/jsp/edit.jsp
+++ b/apps/i2ptunnel/jsp/edit.jsp
@@ -2,6 +2,7 @@
// NOTE: Do the header carefully so there is no whitespace before the <%@page pageEncoding="UTF-8"
+%><%@page trimDirectiveWhitespaces="true"
%><%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"
%><%
String tun = request.getParameter("tunnel");
diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
index ad2d14aa2..fd279fdc3 100644
--- a/apps/i2ptunnel/jsp/editClient.jsp
+++ b/apps/i2ptunnel/jsp/editClient.jsp
@@ -1,4 +1,6 @@
-<%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"%>
+<%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"
+%><%@page trimDirectiveWhitespaces="true"
+%>
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index 45e96f73d..3f6560c16 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -1,4 +1,6 @@
-<%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"%>
+<%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"
+%><%@page trimDirectiveWhitespaces="true"
+%>
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index 9b4149195..3a8eaffb0 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -6,6 +6,7 @@
request.setCharacterEncoding("UTF-8");
%><%@page pageEncoding="UTF-8"
+%><%@page trimDirectiveWhitespaces="true"
%><%@page contentType="text/html" import="net.i2p.i2ptunnel.web.IndexBean"
%>
diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index d560d619a..5a4704091 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html" %>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp
index 255d06144..1dbf23e7d 100644
--- a/apps/routerconsole/jsp/configadvanced.jsp
+++ b/apps/routerconsole/jsp/configadvanced.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp
index eadc66339..21d874938 100644
--- a/apps/routerconsole/jsp/configclients.jsp
+++ b/apps/routerconsole/jsp/configclients.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp
index b76d4af49..a89243391 100644
--- a/apps/routerconsole/jsp/configkeyring.jsp
+++ b/apps/routerconsole/jsp/configkeyring.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp
index af013d009..8274fcb43 100644
--- a/apps/routerconsole/jsp/configlogging.jsp
+++ b/apps/routerconsole/jsp/configlogging.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/confignet.jsp b/apps/routerconsole/jsp/confignet.jsp
index 258425828..febef071a 100644
--- a/apps/routerconsole/jsp/confignet.jsp
+++ b/apps/routerconsole/jsp/confignet.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html" %>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp
index b5968abed..4df9e5915 100644
--- a/apps/routerconsole/jsp/configpeer.jsp
+++ b/apps/routerconsole/jsp/configpeer.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp
index 511b87b59..a807f22ba 100644
--- a/apps/routerconsole/jsp/configreseed.jsp
+++ b/apps/routerconsole/jsp/configreseed.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp
index 3ee1ef796..edff6766c 100644
--- a/apps/routerconsole/jsp/configservice.jsp
+++ b/apps/routerconsole/jsp/configservice.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp
index 7be59bd44..d9bcb20f4 100644
--- a/apps/routerconsole/jsp/configstats.jsp
+++ b/apps/routerconsole/jsp/configstats.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp
index 2bdc9b999..eeb6a752c 100644
--- a/apps/routerconsole/jsp/configtunnels.jsp
+++ b/apps/routerconsole/jsp/configtunnels.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp
index 9d25f87e7..4a214c852 100644
--- a/apps/routerconsole/jsp/configui.jsp
+++ b/apps/routerconsole/jsp/configui.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp
index f21a4c1b0..b1c2a794f 100644
--- a/apps/routerconsole/jsp/configupdate.jsp
+++ b/apps/routerconsole/jsp/configupdate.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/debug.jsp b/apps/routerconsole/jsp/debug.jsp
index 9f6aae574..b9e66345f 100644
--- a/apps/routerconsole/jsp/debug.jsp
+++ b/apps/routerconsole/jsp/debug.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp
index 7bcfc3318..69f9fbfa3 100644
--- a/apps/routerconsole/jsp/error.jsp
+++ b/apps/routerconsole/jsp/error.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/error500.jsp b/apps/routerconsole/jsp/error500.jsp
index 2ffeadff8..2b420e4f6 100644
--- a/apps/routerconsole/jsp/error500.jsp
+++ b/apps/routerconsole/jsp/error500.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp
index de463fb09..54c8e69e0 100644
--- a/apps/routerconsole/jsp/graphs.jsp
+++ b/apps/routerconsole/jsp/graphs.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index 9a8f97afb..265bbfb62 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/help_ar.jsp b/apps/routerconsole/jsp/help_ar.jsp
index 3672aef97..4b471f594 100644
--- a/apps/routerconsole/jsp/help_ar.jsp
+++ b/apps/routerconsole/jsp/help_ar.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/help_fr.jsp b/apps/routerconsole/jsp/help_fr.jsp
index 74ff18b40..fd0f8bc26 100644
--- a/apps/routerconsole/jsp/help_fr.jsp
+++ b/apps/routerconsole/jsp/help_fr.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/help_nl.jsp b/apps/routerconsole/jsp/help_nl.jsp
index 57b0d73fa..944e65e7b 100644
--- a/apps/routerconsole/jsp/help_nl.jsp
+++ b/apps/routerconsole/jsp/help_nl.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/help_ru.jsp b/apps/routerconsole/jsp/help_ru.jsp
index 1b5d9e84c..d14da0138 100644
--- a/apps/routerconsole/jsp/help_ru.jsp
+++ b/apps/routerconsole/jsp/help_ru.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp
index 61cf15753..41135263c 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/jobs.jsp b/apps/routerconsole/jsp/jobs.jsp
index a076de97c..2e2e71248 100644
--- a/apps/routerconsole/jsp/jobs.jsp
+++ b/apps/routerconsole/jsp/jobs.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index f7dd9b815..95786e798 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp
index f4bb5ee75..cfbd3b2ac 100644
--- a/apps/routerconsole/jsp/netdb.jsp
+++ b/apps/routerconsole/jsp/netdb.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/nowebapp.jsp b/apps/routerconsole/jsp/nowebapp.jsp
index f62ae6b16..1bbec502d 100644
--- a/apps/routerconsole/jsp/nowebapp.jsp
+++ b/apps/routerconsole/jsp/nowebapp.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/oldconsole.jsp b/apps/routerconsole/jsp/oldconsole.jsp
index 7421b414a..7edb76240 100644
--- a/apps/routerconsole/jsp/oldconsole.jsp
+++ b/apps/routerconsole/jsp/oldconsole.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/peers.jsp b/apps/routerconsole/jsp/peers.jsp
index 1110904d5..6b0ed6b67 100644
--- a/apps/routerconsole/jsp/peers.jsp
+++ b/apps/routerconsole/jsp/peers.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp
index a7f5db47e..8441838e2 100644
--- a/apps/routerconsole/jsp/profiles.jsp
+++ b/apps/routerconsole/jsp/profiles.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/stats.jsp b/apps/routerconsole/jsp/stats.jsp
index 9cfeaea5f..c0596f796 100644
--- a/apps/routerconsole/jsp/stats.jsp
+++ b/apps/routerconsole/jsp/stats.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp
index 541f0f13f..bdd4a8cbc 100644
--- a/apps/routerconsole/jsp/summaryframe.jsp
+++ b/apps/routerconsole/jsp/summaryframe.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<%
diff --git a/apps/routerconsole/jsp/tunnels.jsp b/apps/routerconsole/jsp/tunnels.jsp
index 843a0a1b4..32f86475a 100644
--- a/apps/routerconsole/jsp/tunnels.jsp
+++ b/apps/routerconsole/jsp/tunnels.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/routerconsole/jsp/viewprofile.jsp b/apps/routerconsole/jsp/viewprofile.jsp
index 05e0fda0e..8747a6d88 100644
--- a/apps/routerconsole/jsp/viewprofile.jsp
+++ b/apps/routerconsole/jsp/viewprofile.jsp
@@ -1,4 +1,5 @@
<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index 109425f9d..86054c149 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -29,6 +29,7 @@
%>
<%@page pageEncoding="UTF-8"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@ page contentType="text/html"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp
index 675797338..256e2ead8 100644
--- a/apps/susidns/src/jsp/config.jsp
+++ b/apps/susidns/src/jsp/config.jsp
@@ -29,6 +29,7 @@
%>
<%@page pageEncoding="UTF-8"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@ page contentType="text/html" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp
index 042f07ea2..a17230a7f 100644
--- a/apps/susidns/src/jsp/details.jsp
+++ b/apps/susidns/src/jsp/details.jsp
@@ -26,6 +26,7 @@
%>
<%@page pageEncoding="UTF-8"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@ page contentType="text/html"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp
index 7c55c8465..1cb170d9d 100644
--- a/apps/susidns/src/jsp/index.jsp
+++ b/apps/susidns/src/jsp/index.jsp
@@ -29,6 +29,7 @@
%>
<%@page pageEncoding="UTF-8"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@ page contentType="text/html"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp
index 8e2a7042f..6a0c27b35 100644
--- a/apps/susidns/src/jsp/subscriptions.jsp
+++ b/apps/susidns/src/jsp/subscriptions.jsp
@@ -29,6 +29,7 @@
%>
<%@page pageEncoding="UTF-8"%>
+<%@page trimDirectiveWhitespaces="true"%>
<%@ page contentType="text/html"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>