diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index dd9b14ba3..d6acf4853 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -774,7 +774,8 @@ public class I2PSnarkServlet extends DefaultServlet {
         if (action.equals(_("Delete selected")) || action.equals(_("Change open trackers"))) {
             boolean changed = false;
             Map<String, Tracker> trackers = _manager.getTrackerMap();
-            StringBuilder openBuf = new StringBuilder(128);
+            List<String> removed = new ArrayList();
+            List<String> open = new ArrayList();
             Enumeration e = req.getParameterNames();
             while (e.hasMoreElements()) {
                  Object o = e.nextElement();
@@ -783,19 +784,26 @@ public class I2PSnarkServlet extends DefaultServlet {
                  String k = (String) o;
                  if (k.startsWith("delete_")) {
                      k = k.substring(7);
-                     if (trackers.remove(k) != null) {
+                     Tracker t;
+                     if ((t = trackers.remove(k)) != null) {
+                        removed.add(t.announceURL);
                         _manager.addMessage(_("Removed") + ": " + k);
                         changed = true;
-                    }
+                     }
                 } else if (k.startsWith("open_")) {
-                     if (openBuf.length() > 0)
-                         openBuf.append(',');
-                     openBuf.append(k.substring(5));
+                     open.add(k.substring(5));
                 }
             }
             if (changed) {
                 _manager.saveTrackerMap();
             }
+            open.removeAll(removed);
+            StringBuilder openBuf = new StringBuilder(128);
+            for (String s : open) {
+                 if (openBuf.length() > 0)
+                     openBuf.append(',');
+                 openBuf.append(s);
+            }
             String newOpen = openBuf.toString();
             if (!newOpen.equals(_manager.util().getOpenTrackerString())) {
                 _manager.saveOpenTrackers(newOpen);
diff --git a/history.txt b/history.txt
index 5056a1134..b274c8fc4 100644
--- a/history.txt
+++ b/history.txt
@@ -1,8 +1,20 @@
+2012-06-04 zzz
+ * i2psnark: Take tracker out of opentracker list when removed
+
 2012-06-03 kytv
 * Translation updates:
   - Add Hungarian language from Transifex (thanks AdminLMH!)
   - Italian language updates from Transifex (thanks ColumboBT)
 
+2012-06-02 zzz
+ * i2psnark: Improve opentracker configuration
+ * Job Queue: Add failsafe check
+
+2012-06-01 zzz
+ * Console: Tab the netdb and profile pages
+ * i2psnark: Fix partially-complete torrent not announcing
+ * NetDB: Reduce flood redundancy from 8x to 6x
+
 2012-05-31 zzz
  * i2psnark:
    - Add per-hour conn limit