diff --git a/ennstatus/templates/base.html b/ennstatus/templates/base.html
--- a/ennstatus/templates/base.html
+++ b/ennstatus/templates/base.html
@@ -33,7 +33,11 @@
     <div class="navbar-collapse collapse">
       <ul class="nav navbar-nav navbar-left">
         <li>
-          <a href="http://wiki.enn.lu/doku.php?id=news">News</a>
+          {% if '.onion' in request.url_root %}
+            <a href="qzz2cvotstk357oj.onion/doku.php?id=news">News</a>
+          {% else %}
+            <a href="http://wiki.enn.lu/doku.php?id=news">News</a>
+          {% endif %}
         </li>
         <li>
           <a href="{{ url_for('root.about') }}">About</a>
@@ -69,7 +73,11 @@
           <a href="{{ url_for('root.abuse') }}">Abuse</a>
         </li>
         <li>
-          <a href="http://wiki.enn.lu">Wiki</a>
+          {% if '.onion' in request.url_root %}
+            <a href="qzz2cvotstk357oj.onion">Wiki</a>
+          {% else %}
+            <a href="http://wiki.enn.lu">Wiki</a>
+          {% endif %}
         </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Servers <b class="caret"></b></a>
diff --git a/ennstatus/templates/status/macros.html b/ennstatus/templates/status/macros.html
--- a/ennstatus/templates/status/macros.html
+++ b/ennstatus/templates/status/macros.html
@@ -29,7 +29,12 @@
   {% else %}
     {% set url_type = 'bridge' %}
   {% endif %}
-  <a href="http://globe.enn.lu/#/{{ url_type }}/{{ fingerprint }}">{{ fingerprint|upper}}</a>
+  {% if '.onion' in request.url_root %}
+    {% set url_root = 'ji3yb2tncy6naj7b.onion' %}
+  {% else %}
+    {% set url_root = 'http://globe.enn.lu' %}
+  {% endif %}
+  <a href="{{ url_root }}/#/{{ url_type }}/{{ fingerprint }}">{{ fingerprint|upper}}</a>
 {% endmacro %}
 
 {% macro create_name(name) %}