Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 9146)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 9147)
@@ -1108,5 +1108,5 @@
         public void actionPerformed(ActionEvent e) {
             try {
-                String base = Main.pref.get("url.openstreetmap-wiki", "http://wiki.openstreetmap.org/wiki/");
+                String base = Main.pref.get("url.openstreetmap-wiki", "https://wiki.openstreetmap.org/wiki/");
                 String lang = LanguageInfo.getWikiLanguagePrefix();
                 final List<URI> uris = new ArrayList<>();
Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 9146)
+++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 9147)
@@ -888,7 +888,7 @@
     private static ImageResource getIfAvailableWiki(String name, ImageType type) {
         final Collection<String> defaultBaseUrls = Arrays.asList(
-                "http://wiki.openstreetmap.org/w/images/",
-                "http://upload.wikimedia.org/wikipedia/commons/",
-                "http://wiki.openstreetmap.org/wiki/File:"
+                "https://wiki.openstreetmap.org/w/images/",
+                "https://upload.wikimedia.org/wikipedia/commons/",
+                "https://wiki.openstreetmap.org/wiki/File:"
                 );
         final Collection<String> baseUrls = Main.pref.getCollection("image-provider.wiki.urls", defaultBaseUrls);
Index: /trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java	(revision 9146)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java	(revision 9147)
@@ -10,5 +10,7 @@
 import java.io.IOException;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
 
@@ -17,4 +19,12 @@
  */
 public class ImageProviderTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUp() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
 
     /**
@@ -41,3 +51,9 @@
         assertNotNull(img);
     }
+
+    @Test
+    public void testWikiProtocol() throws Exception {
+        // https://commons.wikimedia.org/wiki/File:OpenJDK_logo.svg
+        assertNotNull(ImageProvider.get("wiki://OpenJDK_logo.svg"));
+    }
 }