diff --git a/i2p2www/blog/2010/12/22/release-0.8.2.html b/i2p2www/blog/2010/12/22/release-0.8.2.html
index 6655ebdb..42e728e2 100644
--- a/i2p2www/blog/2010/12/22/release-0.8.2.html
+++ b/i2p2www/blog/2010/12/22/release-0.8.2.html
@@ -11,7 +11,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p.
 </p>
diff --git a/i2p2www/blog/2011/01/24/release-0.8.3.html b/i2p2www/blog/2011/01/24/release-0.8.3.html
index 2b1762d8..11e624ca 100644
--- a/i2p2www/blog/2011/01/24/release-0.8.3.html
+++ b/i2p2www/blog/2011/01/24/release-0.8.3.html
@@ -17,7 +17,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p.
 </p>
diff --git a/i2p2www/blog/2011/03/02/release-0.8.4.html b/i2p2www/blog/2011/03/02/release-0.8.4.html
index b4cbcd6c..2282f00e 100644
--- a/i2p2www/blog/2011/03/02/release-0.8.4.html
+++ b/i2p2www/blog/2011/03/02/release-0.8.4.html
@@ -7,7 +7,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p-dev.
 </p>
diff --git a/i2p2www/blog/2011/04/18/release-0.8.5.html b/i2p2www/blog/2011/04/18/release-0.8.5.html
index d2092c30..465ecb85 100644
--- a/i2p2www/blog/2011/04/18/release-0.8.5.html
+++ b/i2p2www/blog/2011/04/18/release-0.8.5.html
@@ -6,7 +6,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p-dev.
 </p>
diff --git a/i2p2www/blog/2011/05/16/release-0.8.6.html b/i2p2www/blog/2011/05/16/release-0.8.6.html
index 63c047b6..2d3d1f91 100644
--- a/i2p2www/blog/2011/05/16/release-0.8.6.html
+++ b/i2p2www/blog/2011/05/16/release-0.8.6.html
@@ -7,7 +7,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p-dev.
 </p>
diff --git a/i2p2www/blog/2011/06/27/release-0.8.7.html b/i2p2www/blog/2011/06/27/release-0.8.7.html
index 9be1ec9f..5f8c82c3 100644
--- a/i2p2www/blog/2011/06/27/release-0.8.7.html
+++ b/i2p2www/blog/2011/06/27/release-0.8.7.html
@@ -26,7 +26,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p-dev.
 </p>
diff --git a/i2p2www/blog/2011/08/23/release-0.8.8.html b/i2p2www/blog/2011/08/23/release-0.8.8.html
index 39e46c18..dbe13b3d 100644
--- a/i2p2www/blog/2011/08/23/release-0.8.8.html
+++ b/i2p2www/blog/2011/08/23/release-0.8.8.html
@@ -13,7 +13,7 @@ Please help grow the network.
 <a href="http://www.i2p2.de/getinvolved.html">Get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.de/donate.html">donate</a>!
-If you find a bug, please enter a report on <a href="http://trac.i2p2.de/report/1">trac</a>.
+If you find a bug, please enter a report on <a href="http://i2pgit.org/i2p-hackers/i2p.i2p/issues">gitlab</a>.
 We are still looking for help on new and existing translations.
 Please volunteer on IRC #i2p-dev.
 </p>
diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 533ee15b..0e738810 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -39,14 +39,6 @@
               <li><a href="{{ site_url('get-involved/develop/developers-keys') }}"><div class="menuitem"><span>{{ _('Developers keys') }}</span></div></a></li>
             </ul>
           </li>
-          <li class="has-sub"><div class="menuitem"><span>{{ _('Comparisons') }}</span></div>
-            <ul>
-              <li><a href="{{ site_url('comparison/tor') }}"><div class="menuitem"><span>Tor</span></div></a></li>
-              <li><a href="{{ site_url('comparison/freenet') }}"><div class="menuitem"><span>Freenet</span></div></a></li>
-              {#<li><a href="{{ site_url('comparison/gnunet') }}"><div class="menuitem"><span>GNUnet</span></div></a></li> #}
-              <li><a href="{{ site_url('comparison/other-networks') }}"><div class="menuitem"><span>{{ _('Other anonymous networks') }}</span></div></a></li>
-            </ul>
-          </li>
           <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
         </ul>
       </li>
diff --git a/i2p2www/pages/site/comparison/index.html b/i2p2www/pages/site/comparison/index.html
index cf4232f4..dd8f58e8 100644
--- a/i2p2www/pages/site/comparison/index.html
+++ b/i2p2www/pages/site/comparison/index.html
@@ -30,9 +30,9 @@ The following are discussed on the <a href="{{ othernetworks }}">other networks
   <li>Haystack</li>
 </ul>
 
-<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans trac='https://i2pgit.org/i2p-hackers/i2p.www/issues' -%}
 The content of this page is subject to update, discussion and dispute, and we welcome comments and additions.
-You may contribute an analysis by entering a <a href="{{ trac }}">new ticket on Trac</a>.
+You may contribute an analysis by entering a <a href="{{ trac }}">new issue on Github</a>.
 {%- endtrans %}</p>
 
 {% endblock %}
diff --git a/i2p2www/pages/site/comparison/other-networks.html b/i2p2www/pages/site/comparison/other-networks.html
index e88a4abc..de6f6657 100644
--- a/i2p2www/pages/site/comparison/other-networks.html
+++ b/i2p2www/pages/site/comparison/other-networks.html
@@ -14,12 +14,12 @@ The following networks are discussed on this page.
 <li>Haystack</li>
 </ul>
 
-<p>{% trans comparison=site_url('comparison'), trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans comparison=site_url('comparison'), trac='https://i2pgit.org/i2p-hackers/i2p.www/issues' -%}
 Most of the following sections are fairly old, and may not be accurate.
 For an overview of available comparisons, see the
 <a href="{{ comparison }}">main network comparisons page</a>.
 You may contribute an analysis by entering a
-<a href="{{ trac }}">new ticket on Trac</a>.
+<a href="{{ trac }}">new issue on Github</a>.
 {%- endtrans %}</p>
 
 
@@ -246,15 +246,15 @@ I2P is, of course, open source. However, that source, and our
 {%- endtrans %}</p>
 
 <h2>{{ _('Paid VPN Services') }}</h2>
-<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans trac='https://i2pgit.org/i2p-hackers/i2p.www/issues' -%}
 You may contribute an analysis by entering a
-<a href="{{ trac }}">new ticket on Trac</a>.
+<a href="{{ trac }}">new issue on Github</a>.
 {%- endtrans %}</p>
 
 <h2>{{ _('Others') }}</h2>
-<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans trac='https://i2pgit.org/i2p-hackers/i2p.www/issues' -%}
 You may contribute an analysis by entering a
-<a href="{{ trac }}">new ticket on Trac</a>.
+<a href="{{ trac }}">new issue on Github</a>.
 {%- endtrans %}</p>
 
 
diff --git a/i2p2www/pages/site/docs/index.html b/i2p2www/pages/site/docs/index.html
index 6d8a3a1a..ebb7658d 100644
--- a/i2p2www/pages/site/docs/index.html
+++ b/i2p2www/pages/site/docs/index.html
@@ -15,7 +15,7 @@ The interface between applications and the router is the I2CP (I2P Control
 Protocol) API.
 {%- endtrans %}</p>
 
-<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans trac='https://i2pgit.org/i2p-hackers/i2p.www/issues' -%}
 The I2P Project is committed to maintaining accurate, current documentation.
 If you find any inaccuracies in the documents linked below, please
 <a href="{{ trac }}">enter a ticket identifying the problem</a>.
@@ -251,7 +251,7 @@ ancient (str4d)
 </li><li>
 <a href="http://{{ i2pconv('zzz.i2p') }}/">{{ _('Developer forum inside I2P') }}</a>
 </li><li>
-<a href="https://trac.i2p2.de/report/1">{{ _('Bug tracker') }}</a>
+<a href="https://i2pgit.org/i2p-hackers/i2p.i2p/issues">{{ _('Bug tracker') }}</a>
 <!--
 </li><li>
 <a href="http://{{ i2pconv('killyourtv.i2p') }}/viewmtn/">{{ _('Viewmtn inside I2P') }}</a>.
diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html
index 2476f8db..2a8bc515 100644
--- a/i2p2www/pages/site/faq.html
+++ b/i2p2www/pages/site/faq.html
@@ -1043,8 +1043,8 @@ either through our IRC network, IRC2P, or on Freenode.{%- endtrans %}</p>
 <ul>
 <li>{% trans -%}Our Bugtracker:{%- endtrans %}
   <ul>
-    <li>{% trans -%}Non-private internet:{%- endtrans %} <a href="https://trac.i2p2.de/report/1">https://trac.i2p2.de/report/1</a></li>
-    <li>{% trans -%}On I2P:{%- endtrans %} <a href="http://trac.i2p2.i2p/report/1">http://trac.i2p2.i2p/report/1</a></li>
+    <li>{% trans -%}Non-private internet:{%- endtrans %} <a href="https://i2pgit.org/i2p-hackers/i2p.i2p/issues">https://i2pgit.org/i2p-hackers/i2p.i2p/issues</a></li>
+    <li>{% trans -%}On I2P:{%- endtrans %} <a href="http://git.idk.i2p/i2p-hackers/i2p.i2p/issues">http://i2pgit.org/i2p-hackers/i2p.i2p/issues</a></li>
   </ul>
 <li>{% trans -%}Our forums:{%- endtrans %} <a href="http://{{ i2pconv('i2pforum.i2p') }}/">{{ i2pconv('i2pforum.i2p') }}</a></li>
 <li>{% trans -%}You may paste any interesting logs to a paste service such as the non-private internet services listed on the 
diff --git a/i2p2www/pages/site/get-involved/guides/new-developers.html b/i2p2www/pages/site/get-involved/guides/new-developers.html
index 0b6d137a..b2f8c72a 100644
--- a/i2p2www/pages/site/get-involved/guides/new-developers.html
+++ b/i2p2www/pages/site/get-involved/guides/new-developers.html
@@ -53,7 +53,7 @@ there are two ways to get the source code:
 <h3 id="git">{% trans %}The easy way: Git{% endtrans %}</h3>
 
 <p>{% trans trac="https://trac.i2p2.de" -%}I2P now has official Git services and accepts contributions via Git at our own gitlab.
-For the time being, issues are still being manged on <a href="{{ trac }}">trac</a>.{%- endtrans %}</p>
+For the time being, issues are still being manged on <a href="{{ trac }}">gitlab</a>.{%- endtrans %}</p>
 
 <li>{% trans git_url='https://git-scm.com/' -%}
 Install <a href="{{ git_url }}">Git</a>.
@@ -164,7 +164,7 @@ see the <a href="{{ apps }}">application development guide</a>.
 {%- endtrans %}</p>
 
 <h2 id="development-ideas">{% trans %}Development ideas{% endtrans %}</h2>
-<p>{% trans zzz=i2pconv('zzz.i2p'), todo=site_url('get-involved/todo'), trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans zzz=i2pconv('zzz.i2p'), todo=site_url('get-involved/todo'), trac='https://i2pgit.org/i2p-hackers/i2p.i2p/issues' -%}
 See <a href="http://{{ zzz }}/forums/3">zzz's TODO lists</a>,
 <a href="{{ todo }}">this website's TODO list</a> or
 <a href="{{ trac }}">Trac</a>
diff --git a/i2p2www/pages/spec/index.html b/i2p2www/pages/spec/index.html
index 5fc5a818..16c3a5ee 100644
--- a/i2p2www/pages/spec/index.html
+++ b/i2p2www/pages/spec/index.html
@@ -22,7 +22,7 @@ in during the course of development. Periodic reviews are conducted to update
 the "accurate for" information.
 </li></ul>
 
-<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
+<p>{% trans trac='https://i2pgit.org/i2p-hackers/i2p.www/issues' -%}
 The I2P Project is committed to maintaining accurate, current documentation.
 If you find any inaccuracies in the documents linked below, please
 <a href="{{ trac }}">enter a ticket identifying the problem</a>.