diff --git a/core/java/src/net/i2p/util/PortMapper.java b/core/java/src/net/i2p/util/PortMapper.java
index f94d073a9..0b7849c6f 100644
--- a/core/java/src/net/i2p/util/PortMapper.java
+++ b/core/java/src/net/i2p/util/PortMapper.java
@@ -3,6 +3,7 @@ package net.i2p.util;
 import java.io.IOException;
 import java.io.Writer;
 import java.net.InetSocketAddress;
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -305,7 +306,7 @@ public class PortMapper {
     public void renderStatusHTML(Writer out) throws IOException {
         List<String> services = new ArrayList<String>(_dir.keySet());
         out.write("<h2 id=\"debug_portmapper\">Port Mapper</h2><table id=\"portmapper\"><tr><th>Service<th>Host<th>Port\n");
-        Collections.sort(services);
+        Collections.sort(services, Collator.getInstance());
         for (String s : services) {
             InetSocketAddress ia = _dir.get(s);
             if (ia == null)
diff --git a/router/java/src/net/i2p/router/startup/RouterAppManager.java b/router/java/src/net/i2p/router/startup/RouterAppManager.java
index 27cee8ddc..71b8bf4d4 100644
--- a/router/java/src/net/i2p/router/startup/RouterAppManager.java
+++ b/router/java/src/net/i2p/router/startup/RouterAppManager.java
@@ -2,6 +2,7 @@ package net.i2p.router.startup;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.text.Collator;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -208,7 +209,7 @@ public class RouterAppManager extends ClientAppManagerImpl {
             String[] val = entry.getValue();
             list.add("[<b>" + key.getName() + "</b>] = [" + key.getClass().getName() + ' ' + Arrays.toString(val) + "] <i>" + key.getState() + "</i><br>");
         }
-        Collections.sort(list);
+        Collections.sort(list, Collator.getInstance());
         for (String e : list) {
             buf.append(e);
         }
@@ -225,7 +226,7 @@ public class RouterAppManager extends ClientAppManagerImpl {
             ClientApp val = entry.getValue();
             list.add("[<b>" + key + "</b>] = [" + val.getClass().getName() + "]<br>");
         }
-        Collections.sort(list);
+        Collections.sort(list, Collator.getInstance());
         for (String e : list) {
             buf.append(e);
         }