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 53b1abc27..fa942d1f8 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -547,20 +547,32 @@ public class I2PSnarkServlet extends HttpServlet {
                 out.write("</td>\n\t");
                 out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
                 if (remaining > 0) {
-                    if (peer.isInteresting() && !peer.isChoked())
+                    if (peer.isInteresting() && !peer.isChoked()) {
                         out.write("<font color=#008000>");
-                    else
-                        out.write("<font color=#a00000>");
-                    out.write("<font size=-1>" + formatSize(peer.getDownloadRate()) + "ps</font></font>");
+                        out.write("<font size=-1>" + formatSize(peer.getDownloadRate()) + "ps</font></font>");
+                    } else {
+                        out.write("<font color=#a00000><font size=-1><a title=\"");
+                        if (!peer.isInteresting())
+                            out.write("Uninteresting\">");
+                        else
+                            out.write("Choked\">");
+                        out.write(formatSize(peer.getDownloadRate()) + "ps</a></font></font>");
+                    }
                 }
                 out.write("</td>\n\t");
                 out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
                 if (pct != 100.0) {
-                    if (peer.isInterested() && !peer.isChoking())
+                    if (peer.isInterested() && !peer.isChoking()) {
                         out.write("<font color=#008000>");
-                    else
-                        out.write("<font color=#a00000>");
-                    out.write("<font size=-1>" + formatSize(peer.getUploadRate()) + "ps</font></font>");
+                        out.write("<font size=-1>" + formatSize(peer.getUploadRate()) + "ps</font></font>");
+                    } else {
+                        out.write("<font color=#a00000><font size=-1><a title=\"");
+                        if (!peer.isInterested())
+                            out.write("Uninterested\">");
+                        else
+                            out.write("Choking\">");
+                        out.write(formatSize(peer.getUploadRate()) + "ps</a></font></font>");
+                    }
                 }
                 out.write("</td>\n\t");
                 out.write("<td class=\"snarkTorrentStatus " + rowClass + "\">");
diff --git a/history.txt b/history.txt
index 28d2ba13b..294e546a8 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
-$Id: history.txt,v 1.577 2007-07-15 13:34:33 zzz Exp $
+$Id: history.txt,v 1.578 2007-07-16 15:47:57 zzz Exp $
+
+2007-07-16  zzz
+    * i2psnark: Add tooltip info for choked/uninterested
 
 2007-07-16  zzz
     * Make selection of graphed data configurable via configstats.jsp,
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f5894ca3d..0242b6857 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.512 $ $Date: 2007-07-15 13:34:34 $";
+    public final static String ID = "$Revision: 1.513 $ $Date: 2007-07-16 15:47:59 $";
     public final static String VERSION = "0.6.1.28";
-    public final static long BUILD = 15;
+    public final static long BUILD = 16;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);