Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java	(revision 7335)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java	(revision 7337)
@@ -79,5 +79,11 @@
     private SSLContext sslContext;
 
-    private static final String KEYSTORE_FILENAME = "josm.keystore";
+    private static final int HTTPS_PORT = 8112;
+
+    /**
+     * JOSM keystore file name.
+     * @since 7337
+     */
+    public static final String KEYSTORE_FILENAME = "josm.keystore";
 
     /**
@@ -196,5 +202,6 @@
                     KeyPair pair = generator.generateKeyPair();
 
-                    X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA", "ip:127.0.0.1");
+                    X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA",
+                            "ip:127.0.0.1,dns:localhost,uri:https://127.0.0.1:"+HTTPS_PORT);
 
                     KeyStore ks = KeyStore.getInstance("JKS");
@@ -255,5 +262,5 @@
      */
     public static void restartRemoteControlHttpsServer() {
-        int port = Main.pref.getInteger("remote.control.https.port", 8112);
+        int port = Main.pref.getInteger("remote.control.https.port", HTTPS_PORT);
         try {
             stopRemoteControlHttpsServer();
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 7335)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 7337)
@@ -262,5 +262,5 @@
             }
         }
-        // JOSM certificate not found, install it
+        // JOSM certificate not found, install it to Windows-ROOT keystore, used by IE, Chrome and Safari, but not by Firefox
         Main.info(tr("Adding JOSM localhost certificate to {0} keystore", WINDOWS_ROOT));
         ks.setEntry("josm_localhost", trustedCert, null);