diff --git a/i2p2www/pages/site/docs/index.html b/i2p2www/pages/site/docs/index.html
index 9a467f7c2c1aee649083f79a39179e1b4dfdce37..3057123978e32f984266f0fbf5fe893e07bfa23b 100644
--- a/i2p2www/pages/site/docs/index.html
+++ b/i2p2www/pages/site/docs/index.html
@@ -219,7 +219,8 @@ Traditionally used only by Java applications and higher-level APIs.
 <a href="{{ site_url('get-involved/guides/dev-guidelines') }}">{{ _('Developer Guidelines') }}</a>
 </li><li>
 {% trans %}Javadocs on the standard internet:{% endtrans %}
-<a href="http://docs.i2p-projekt.de/javadoc/">{% trans num=1 %}Server {{ num }}{% endtrans %}</a>
+<a href="https://docs.i2p-projekt.de/javadoc/">{% trans num=1 %}Server {{ num }}{% endtrans %}</a>
+<a href="https://eyedeekay.github.io/javadoc-i2p/">{% trans num=3 %}Server {{ num }}{% endtrans %}</a>
 {% trans %}Note: always verify that javadocs are current by checking the release number.{% endtrans %}
 </li><li>
 {% trans %}Javadocs inside I2P:{% endtrans %}
@@ -229,7 +230,7 @@ down (kytv)
 ancient (str4d)
 <a href="http://{{ i2pconv('i2pdocs.str4d.i2p') }}/i2p.i2p/javadoc/">{% trans num=2 %}Server {{ num }}{% endtrans %}</a>
 -->
-<a href="http://{{ i2pconv('echelon.i2p') }}/javadoc/">{% trans num=3 %}Server {{ num }}{% endtrans %}</a>
+<a href="http://{{ i2pconv('idk.i2p') }}/javadoc-i2p/">{% trans num=3 %}Server {{ num }}{% endtrans %}</a>
 <!--
   <a href="http://{{ i2pconv('docs.i2p2.i2p') }}/javadoc/">Server 4 - out of date, incomplete</a>
 -->
@@ -243,8 +244,6 @@ ancient (str4d)
 </li><li>
 <a href="{{ site_url('docs/ports') }}">{{ _('Ports used by I2P') }}</a>
 </li><li>
-<a href="http://{{ i2pconv('bobthebuilder.i2p') }}/mtn/">{{ _('Automatic updates to development builds inside I2P') }}</a>
-</li><li>
 <a href="{{ site_url('misc/manual-wrapper') }}">{{ _('Updating the wrapper manually') }}</a>
 </li><li>
 <a href="http://{{ i2pconv('i2pforum.i2p') }}">{{ _('User forum') }}</a>
diff --git a/i2p2www/templatevars.py b/i2p2www/templatevars.py
index 869696cd43a6da40034b6ebc7c69b32aec6dd0c5..3c342a85f34c770e010d68127b043d1190469b04 100644
--- a/i2p2www/templatevars.py
+++ b/i2p2www/templatevars.py
@@ -26,6 +26,7 @@ I2P_TO_CLEAR = {
     'lists.i2p': 'lists.i2p.email',
     'i2p-javadocs.i2p': 'docs.i2p-projekt.de/javadoc', # Hacky to include the path, but it works!
     'idk.i2p/javadoc': 'docs.i2p-projekt.de/javadoc', # Hacky to include the path, but it works!
+    "idk.i2p": "eyedeekay.github.io",
     'stats.i2p': 'stats.i2p', # Inproxy disabled at request of site owner
     'zzz.i2p': 'zzz.i2p',     # Inproxy disabled at request of site owner
     'git.idk.i2p': 'i2pgit.org', # Git mirror