diff --git a/apps/i2ptunnel/jsp/edit.jsp b/apps/i2ptunnel/jsp/edit.jsp
index e35f23c0fb..236e600f0b 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 ad2d14aa2c..fd279fdc35 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 45e96f73d0..3f6560c16b 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 9b41491950..3a8eaffb0d 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 d560d619a9..5a47040916 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 255d06144c..1dbf23e7d4 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 eadc663396..21d8749380 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 b76d4af491..a89243391b 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 af013d0095..8274fcb438 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 2584258289..febef071a9 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 b5968abedc..4df9e5915d 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 511b87b595..a807f22ba2 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 3ee1ef7967..edff6766ca 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 7be59bd440..d9bcb20f43 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 2bdc9b9998..eeb6a752cf 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 9d25f87e71..4a214c8524 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 f21a4c1b02..b1c2a794fc 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 9f6aae5740..b9e66345f6 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 7bcfc3318e..69f9fbfa31 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 2ffeadff87..2b420e4f6d 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 de463fb093..54c8e69e05 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 9a8f97afb9..265bbfb628 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 3672aef975..4b471f594f 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 74ff18b400..fd0f8bc268 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 57b0d73fa1..944e65e7b9 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 1b5d9e84c8..d14da01386 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 61cf157535..41135263c8 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 a076de97ca..2e2e712484 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 f7dd9b815a..95786e7988 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 f4bb5ee757..cfbd3b2ac1 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 f62ae6b162..1bbec502dd 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 7421b414a8..7edb762409 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 1110904d55..6b0ed6b67b 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 a7f5db47ec..8441838e2d 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 9cfeaea5fa..c0596f7961 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 541f0f13f5..bdd4a8cbc1 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 843a0a1b43..32f86475ae 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 05e0fda0e0..8747a6d88b 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 109425f9d2..86054c1499 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 6757973384..256e2ead86 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 042f07ea2b..a17230a7f5 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 7c55c84651..1cb170d9df 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 8e2a7042f6..6a0c27b359 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"%>