diff --git a/www.i2p2/pages/bounties.html b/www.i2p2/pages/bounties.html
index e89a4d5d22fe51937ac1f51c0a65516841aec202..0e7692c3e6f542b82c22778b670dcf1471de76e8 100644
--- a/www.i2p2/pages/bounties.html
+++ b/www.i2p2/pages/bounties.html
@@ -148,7 +148,7 @@ etc), and the like.</p>
  </tr>
  <tr>
   <td><p><b><a href="http://gcc.gnu.org/java/">GCJ</a> support</b></p></td>
-  <td><p><a href="https://trac.i2p2.de/browser/Makefile.gcj">Claimed</a></p></td>
+  <td><p><a href="https://github.com/i2p/i2p.i2p/tree/master/Makefile.gcj">Claimed</a></p></td>
   <td><p>jrandom</p></td>
  </tr>
 </table>
diff --git a/www.i2p2/pages/bounties_ar.html b/www.i2p2/pages/bounties_ar.html
index 725bce5f2d4bbfc14f37a196c4b969375bf467cc..4a5efc8ff6ab7dd3d6009bcc1a22bb64e76289ff 100644
--- a/www.i2p2/pages/bounties_ar.html
+++ b/www.i2p2/pages/bounties_ar.html
@@ -135,7 +135,7 @@
  </tr>
  <tr>
   <td><p><b><a href="http://gcc.gnu.org/java/">GCJ</a> دعم</b></p></td>
-  <td><p><a href="https://trac.i2p2.de/browser/Makefile.gcj">مستعمل</a></p></td>
+  <td><p><a href="https://github.com/i2p/i2p.i2p/tree/master/Makefile.gcj">مستعمل</a></p></td>
   <td><p>jrandom</p></td>
  </tr>
 </table>
diff --git a/www.i2p2/pages/bounties_de.html b/www.i2p2/pages/bounties_de.html
index 8ebc2cbd29428393bdcbdfd7e37e69980e24b8b0..6bf46db354f40cc7659465396b728ae007267049 100644
--- a/www.i2p2/pages/bounties_de.html
+++ b/www.i2p2/pages/bounties_de.html
@@ -145,7 +145,7 @@ etc.) benutzt wird.</p>
  </tr>
  <tr>
   <td><p><b><a href="http://gcc.gnu.org/java/">GCJ</a> support</b></p></td>
-  <td><p><a href="https://trac.i2p2.de/browser/Makefile.gcj">Ausgezahlt</a></p></td>
+  <td><p><a href="https://github.com/i2p/i2p.i2p/tree/master/Makefile.gcj">Ausgezahlt</a></p></td>
   <td><p>jrandom</p></td>
  </tr>
 </table>
diff --git a/www.i2p2/pages/bounties_it.html b/www.i2p2/pages/bounties_it.html
index 3b87db152992077e079e4f7008242c90d64e05b0..08c0a23aef9949cf49f871aa20275cb962358ba2 100644
--- a/www.i2p2/pages/bounties_it.html
+++ b/www.i2p2/pages/bounties_it.html
@@ -115,7 +115,7 @@ etc e simili.</p>
  </tr>
  <tr>
   <td><p><b><a href="http://gcc.gnu.org/java/">GCJ</a> support</b></p></td>
-  <td><p><a href="https://trac.i2p2.de/browser/Makefile.gcj">Claimed</a></p></td>
+  <td><p><a href="https://github.com/i2p/i2p.i2p/tree/master/Makefile.gcj">Claimed</a></p></td>
   <td><p>jrandom</p></td>
  </tr>
 </table>
diff --git a/www.i2p2/pages/bounties_ru.html b/www.i2p2/pages/bounties_ru.html
index d90f4d04f876ea7a2921bf99fbc03a677f11f624..6a16a0fb425fd251a99e67e029c5aaf450fdad49 100644
--- a/www.i2p2/pages/bounties_ru.html
+++ b/www.i2p2/pages/bounties_ru.html
@@ -104,7 +104,7 @@
  </tr>
  <tr>
   <td><p><b>Поддержка <a href="http://gcc.gnu.org/java/">GCJ</a></b></p></td>
-  <td><p><a href="https://trac.i2p2.de/browser/Makefile.gcj">Востребована</a></p></td>
+  <td><p><a href="https://github.com/i2p/i2p.i2p/tree/master/Makefile.gcj">Востребована</a></p></td>
   <td><p>jrandom</p></td>
  </tr>
 </table>
diff --git a/www.i2p2/pages/how_cryptography.html b/www.i2p2/pages/how_cryptography.html
index 08377b1f42cd6d22f728cccacc8ed66791cfe9b1..053d2a8c4018b96450b76c85ccdfafa9da9e859a 100644
--- a/www.i2p2/pages/how_cryptography.html
+++ b/www.i2p2/pages/how_cryptography.html
@@ -97,7 +97,7 @@ This is encoded as two 256-byte encrypted parts,
 and there is a single byte of zero padding before each part at this layer.
 </p><p>
 See 
-<a href="http://trac.i2p2.de/browser/core/java/src/net/i2p/crypto/ElGamalEngine.java?rev=85a542c53d910dffbf34cdcefb8a2faeee96adc4">the ElGamal code</a>.
+<a href="https://github.com/i2p/i2p.i2p/tree/master/core/java/src/net/i2p/crypto/ElGamalEngine.java">the ElGamal code</a>.
 <p>
 The shared prime is the 
 
@@ -171,11 +171,11 @@ We use AES with 256 bit keys and 128 bit blocks in CBC mode.
 The padding used is specified in <a href="http://tools.ietf.org/html/rfc2313">IETF RFC-2313 (PKCS#5 1.5, section 8.1 (for block type 02))</a>.
 In this case, padding exists of pseudorandomly generated octets to match 16 byte blocks.
 Specifically, see 
-<a href="http://trac.i2p2.de/browser/core/java/src/net/i2p/crypto/CryptixAESEngine.java?rev=85a542c53d910dffbf34cdcefb8a2faeee96adc4">[the CBC code]</a> 
+<a href="https://github.com/i2p/i2p.i2p/tree/master/core/java/src/net/i2p/crypto/CryptixAESEngine.java">[the CBC code]</a> 
 and the Cryptix AES 
-<a href="http://trac.i2p2.de/browser/core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java?rev=85a542c53d910dffbf34cdcefb8a2faeee96adc4">[implementation]</a>,
+<a href="https://github.com/i2p/i2p.i2p/tree/master/core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java">[implementation]</a>,
 as well as the padding, found in the
-<a href="http://trac.i2p2.de/browser/core/java/src/net/i2p/crypto/ElGamalAESEngine.java?rev=85a542c53d910dffbf34cdcefb8a2faeee96adc4">ElGamalAESEngine.getPadding</a> function.
+<a href="https://github.com/i2p/i2p.i2p/tree/master/core/java/src/net/i2p/crypto/ElGamalAESEngine.java">ElGamalAESEngine.getPadding</a> function.
 
 <!-- *********************************************************************************
      Believe it or not, we don't do this any more. If we ever did. safeEncode() and safeDecode() are unused.
@@ -246,7 +246,7 @@ It may be quite difficult to make any change backward-compatible.
 
 <p>
 Signatures are generated and verified with 1024 bit DSA (L=1024, N=160), as implemented in
-<a href="http://trac.i2p2.de/browser/core/java/src/net/i2p/crypto/DSAEngine.java?rev=85a542c53d910dffbf34cdcefb8a2faeee96adc4">[DSAEngine]</a>.
+<a href="https://github.com/i2p/i2p.i2p/tree/master/core/java/src/net/i2p/crypto/DSAEngine.java">[DSAEngine]</a>.
 DSA was chosen because it is much faster for signatures than ElGamal.
 <p>
 <H3>The DSA constants</H3>
@@ -341,7 +341,7 @@ It may be quite difficult to make any change backward-compatible.
 
 <p>
 Hashes within I2P are plain old SHA256, as implemented in
-<a href="http://trac.i2p2.de/browser/core/java/src/net/i2p/crypto/SHA256Generator.java?rev=85a542c53d910dffbf34cdcefb8a2faeee96adc4">[SHA256Generator]</a>
+<a href="https://github.com/i2p/i2p.i2p/tree/master/core/java/src/net/i2p/crypto/SHA256Generator.java">[SHA256Generator]</a>
 
 
 <H4>Obsolescence</H4>
diff --git a/www.i2p2/pages/plugins.html b/www.i2p2/pages/plugins.html
index d0fb900c46523ef86fe411ca533ef1e2c3195475..494e12b8e044519a934f876a4326b3abffc9a001 100644
--- a/www.i2p2/pages/plugins.html
+++ b/www.i2p2/pages/plugins.html
@@ -78,7 +78,7 @@ or easily add some feature.  </p>
 <h3>Getting Started</h3>
 <p> To create a plugin from an existing binary package you will need to get
 makeplugin.sh from <a
-    href="http://trac.i2p2.de/browser/plugin/makeplugin.sh?rev=776519571fda0689ef09c42f66e7398f30432e87">the
+    href="https://github.com/i2p/i2p.scripts/tree/master/plugin/makeplugin.sh">the
     i2p.scripts branch in monotone</a>.  </p>
 
 
diff --git a/www.i2p2/pages/plugins_fr.html b/www.i2p2/pages/plugins_fr.html
index bb93fdfe3bed8c0eac799667c2966f5d59944102..b12ea0ea9d82249b8cffe0cae2dfd79bc664d08f 100644
--- a/www.i2p2/pages/plugins_fr.html
+++ b/www.i2p2/pages/plugins_fr.html
@@ -85,7 +85,7 @@ d'I2P et pour l'ajout de fonctionnalités.
 
 <h3>Par où commencer ?</h3>
 Pour créer un greffon à partir d'un paquet binaire, vous devez obtenir le script makeplugin.sh à partir de 
-<a href="http://trac.i2p2.de/browser/plugin/makeplugin.sh?rev=776519571fda0689ef09c42f66e7398f30432e87">
+<a href="https://github.com/i2p/i2p.scripts/tree/master/plugin/makeplugin.sh">
 la branche i2p.scripts dans monotone</a>.