diff --git a/INSTALL-headless.txt b/INSTALL-headless.txt
index 97b502bc6..dcc5117e7 100644
--- a/INSTALL-headless.txt
+++ b/INSTALL-headless.txt
@@ -42,4 +42,4 @@ Supported JVMs:
   Windows: Latest available from http://java.com/download (1.5+ supported)
   Linux:   Latest available from http://java.com/download (1.5+ supported)
   FreeBSD: 1.5-compatible (NIO required)
-  Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+  Other operating systems and JVMs: See https://trac.i2p2.de/wiki/java
diff --git a/INSTALL.txt b/INSTALL.txt
index 98aec6995..23701b041 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -2,7 +2,7 @@ I2P source installation instructions
 
 Prerequisites to build from source:
 	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
-          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+          Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
 	Apache Ant 1.7.0 or higher
 	The xgettext, msgfmt, and msgmerge tools installed
 	from the GNU gettext package http://www.gnu.org/software/gettext/
diff --git a/README.txt b/README.txt
index f43b7b4ee..fad70c410 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 Prerequisites to build from source:
 	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
-          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+          Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
 	Apache Ant 1.7.0 or higher
 	The xgettext, msgfmt, and msgmerge tools installed
 	  from the GNU gettext package http://www.gnu.org/software/gettext/
@@ -22,13 +22,13 @@ Documentation:
 	API: run 'ant javadoc' then start at build/javadoc/index.html
 
 Latest release:
-	http://www.i2p2.de/download.html
+	http://www.i2p2.de/download
 
 To get development branch from source control:
-	http://www.i2p2.de/newdevelopers.html
+	http://www.i2p2.de/newdevelopers
 
 FAQ:
-	http://www.i2p2.de/faq.html
+	http://www.i2p2.de/faq
 
 Need help?
 	IRC irc.freenode.net #i2p
diff --git a/apps/routerconsole/jsp/error500.jsp b/apps/routerconsole/jsp/error500.jsp
index 66ef4f414..5f7b96ccb 100644
--- a/apps/routerconsole/jsp/error500.jsp
+++ b/apps/routerconsole/jsp/error500.jsp
@@ -30,7 +30,7 @@
 <% /* note to translators - both parameters are URLs */
 %><%=intl._("Please report bugs on {0} or {1}.",
           "<a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>",
-          "<a href=\"http://trac.i2p2.de/newticket\">trac.i2p2.de</a>")%>
+          "<a href=\"https://trac.i2p2.de/newticket\">trac.i2p2.de</a>")%>
 <%=intl._("You may use the username \"guest\" and password \"guest\" if you do not wish to register.")%>
 <p><%=intl._("Please include this information in bug reports")%>:
 </p></div><div class="sorry" id="warning2">
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index 266a4ffb8..80ef70b9d 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -16,7 +16,7 @@
 <% /* note to translators - both parameters are URLs */
 %><%=intl._("Please report bugs on {0} or {1}.",
           "<a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>",
-          "<a href=\"http://trac.i2p2.de/newticket\">trac.i2p2.de</a>")%>
+          "<a href=\"https://trac.i2p2.de/newticket\">trac.i2p2.de</a>")%>
 <%=intl._("You may use the username \"guest\" and password \"guest\" if you do not wish to register.")%>
 <p><i><%=intl._("Please include this information in bug reports")%>:</i>
  <p>