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 2e3a809ca4..92e0813a40 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -542,7 +542,7 @@ public class I2PSnarkServlet extends BasicServlet {
         out.write("</th>\n<th class=\"snarkTorrentETA\" align=\"right\">");
         if (_manager.util().connected() && !snarks.isEmpty()) {
             if (showSort) {
-                sort = ("4".equals(currentSort)) ? "-4" : "4";
+                sort = ("-4".equals(currentSort)) ? "4" : "-4";
                 out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
                 out.write("\">");
             }
@@ -558,16 +558,16 @@ public class I2PSnarkServlet extends BasicServlet {
         // cycle through sort by size or downloaded
         boolean isDlSort = false;
         if (showSort) {
-            if ("5".equals(currentSort)) {
-                sort = "-5";
-            } else if ("-5".equals(currentSort)) {
-                sort = "6";
-                isDlSort = true;
-            } else if ("6".equals(currentSort)) {
+            if ("-5".equals(currentSort)) {
+                sort = "5";
+            } else if ("5".equals(currentSort)) {
                 sort = "-6";
                 isDlSort = true;
+            } else if ("-6".equals(currentSort)) {
+                sort = "6";
+                isDlSort = true;
             } else {
-                sort = "5";
+                sort = "-5";
             }
             out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
             out.write("\">");
@@ -585,20 +585,20 @@ public class I2PSnarkServlet extends BasicServlet {
             // cycle through sort by uploaded or ratio
             boolean nextRatSort = false;
             if (showSort) {
-                if ("7".equals(currentSort)) {
-                    sort = "-7";
-                } else if ("-7".equals(currentSort)) {
-                    sort = "11";
-                    nextRatSort = true;
-                } else if ("11".equals(currentSort)) {
+                if ("-7".equals(currentSort)) {
+                    sort = "7";
+                } else if ("7".equals(currentSort)) {
                     sort = "-11";
                     nextRatSort = true;
-                    isRatSort = true;
                 } else if ("-11".equals(currentSort)) {
-                    sort = "7";
+                    sort = "11";
+                    nextRatSort = true;
+                    isRatSort = true;
+                } else if ("11".equals(currentSort)) {
+                    sort = "-7";
                     isRatSort = true;
                 } else {
-                    sort = "7";
+                    sort = "-7";
                 }
                 out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
                 out.write("\">");
@@ -614,7 +614,7 @@ public class I2PSnarkServlet extends BasicServlet {
         out.write("</th>\n<th class=\"snarkTorrentRateDown\" align=\"right\">");
         if (_manager.util().connected() && !snarks.isEmpty()) {
             if (showSort) {
-                sort = ("8".equals(currentSort)) ? "-8" : "8";
+                sort = ("-8".equals(currentSort)) ? "8" : "-8";
                 out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
                 out.write("\">");
             }
@@ -629,7 +629,7 @@ public class I2PSnarkServlet extends BasicServlet {
         out.write("</th>\n<th class=\"snarkTorrentRateUp\" align=\"right\">");
         if (_manager.util().connected() && !snarks.isEmpty()) {
             if (showSort) {
-                sort = ("9".equals(currentSort)) ? "-9" : "9";
+                sort = ("-9".equals(currentSort)) ? "9" : "-9";
                 out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
                 out.write("\">");
             }
diff --git a/history.txt b/history.txt
index ea0fc79b4d..d91846ecab 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2018-03-24 zzz
+ * i2psnark: Change default sort order for some columns (ticket #2152)
+
+2018-03-19 zzz
+ * i2ptunnel: Rewrite or pass through Accept: header
+
 2018-03-15 zzz
  * i2psnark: Start even if data directory not found (ticket #2166)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5b1ba79e39..78754ef283 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 19;
+    public final static long BUILD = 20;
 
     /** for example "-test" */
-    public final static String EXTRA = "";
+    public final static String EXTRA = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);