diff --git a/apps/susidns/src/bundle-messages.sh b/apps/susidns/src/bundle-messages.sh
index e21706e880900dab3ac4c663a8aacdb4059eef43..e46eccd73f6816d61c1293aea9223a9df9cd4c32 100755
--- a/apps/susidns/src/bundle-messages.sh
+++ b/apps/susidns/src/bundle-messages.sh
@@ -75,7 +75,7 @@ do
 	echo "Generating ${CLASS}_$LG ResourceBundle..."
 
 	# convert to class files in build/obj
-	msgfmt --java -r $CLASS -l $LG -d WEB-INF/classes $i
+	msgfmt --java --statistics -r $CLASS -l $LG -d WEB-INF/classes $i
 	if [ $? -ne 0 ]
 	then
 		echo 'Warning - msgfmt failed, not updating translations'
diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index 2bcf298ed29920d0a04ce5af0c49c083e73e5c9b..d9ff34695f92524826bd812f82ff5b5b8bde18ef 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -23,6 +23,7 @@
  * $Revision: 1.3 $
  */
 %>
+<%@page pageEncoding="UTF-8"%>
 <%@ page contentType="text/html"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />
@@ -35,6 +36,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>${book.book} addressbook - susidns v${version.version}</title>
 <link rel="stylesheet" type="text/css" href="css.css">
 </head>
diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp
index fd755300c6c7004624f462fe6f3c2cc963417164..415bec75563406cee32d2b9bcc37a8fda187d28c 100644
--- a/apps/susidns/src/jsp/config.jsp
+++ b/apps/susidns/src/jsp/config.jsp
@@ -23,6 +23,7 @@
  * $Revision: 1.1 $
  */
 %>
+<%@page pageEncoding="UTF-8"%>
 <%@ page contentType="text/html" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application"/>
@@ -31,6 +32,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>configuration - susidns v${version.version}</title>
 <link rel="stylesheet" type="text/css" href="css.css">
 </head>
diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp
index 795dd7373b7d24cb8f6a2e96734ff41463137044..581b638f9a18807a234f1cdb73031514125bb506 100644
--- a/apps/susidns/src/jsp/index.jsp
+++ b/apps/susidns/src/jsp/index.jsp
@@ -23,6 +23,7 @@
  * $Revision: 1.2 $
  */
 %>
+<%@page pageEncoding="UTF-8"%>
 <%@ page contentType="text/html"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />
@@ -30,6 +31,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title><%=intl._("Introduction - SusiDNS")%> v${version.version}</title>
 <link rel="stylesheet" type="text/css" href="css.css">
 </head>
diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp
index 75542d57dab18723799e4dd4b9ceecfb465cb803..a60710310f9fde062ce528c0e06dd8df6c8dba9d 100644
--- a/apps/susidns/src/jsp/subscriptions.jsp
+++ b/apps/susidns/src/jsp/subscriptions.jsp
@@ -23,6 +23,7 @@
  * $Revision: 1.2 $
  */
 %>
+<%@page pageEncoding="UTF-8"%>
 <%@ page contentType="text/html"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />
@@ -31,6 +32,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>subscriptions - susidns v${version.version}</title>
 <link rel="stylesheet" type="text/css" href="css.css">
 </head>