diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 107ac43ec..94e797456 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -1442,7 +1442,7 @@ public class SnarkManager implements Snark.CompleteListener {
                 String name = toks[i].trim().replace(",", ",");
                 String url = toks[i+1].trim().replace(",", ",");
                 if ( (name.length() > 0) && (url.length() > 0) ) {
-                    String urls[] = DEFAULT_TRACKERS[i+1].split("=", 2);
+                    String urls[] = url.split("=", 2);
                     String url2 = urls.length > 1 ? urls[1] : null;
                     _trackerMap.put(name, new Tracker(name, urls[0], url2));
                 }
diff --git a/history.txt b/history.txt
index 87e8e434b..14a123d13 100644
--- a/history.txt
+++ b/history.txt
@@ -3,6 +3,7 @@
    - Fixes when complete except for skipped files
      (ticket #447) status in UI, don't connect outbound,
      disconnect seeds when done
+   - Custom tracker map AIOOBE fix
    - More classes pkg private
  * jobs.jsp: Add more queue diagnostics
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 4e28a2c8d..c10128fe6 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 5;
+    public final static long BUILD = 6;
 
     /** for example "-test" */
     public final static String EXTRA = "";