Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 6954)
+++ /trunk/build.xml	(revision 6955)
@@ -239,5 +239,5 @@
             <link href="http://docs.oracle.com/javase/6/docs/api"/>
             <doctitle><![CDATA[<h2>JOSM - Javadoc</h2>]]></doctitle>
-            <bottom><![CDATA[<a href="http://josm.openstreetmap.de/">JOSM</a>]]></bottom>
+            <bottom><![CDATA[<a href="https://josm.openstreetmap.de/">JOSM</a>]]></bottom>
         </javadoc>
     </target>
@@ -386,5 +386,5 @@
         <!-- Download list of plugins -->
         <loadresource property="plugins">
-            <url url="http://josm.openstreetmap.de/plugin"/>
+            <url url="https://josm.openstreetmap.de/plugin"/>
             <filterchain>
                 <linecontainsregexp negate="true">
Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6954)
+++ /trunk/data/defaultpresets.xml	(revision 6955)
@@ -17,5 +17,5 @@
   type: the data types - way,node,relation,closedway (separated by comma)
   name_template: define custom formatting for OSM primitives
-                 see http://josm.openstreetmap.de/wiki/NameTemplate
+                 see https://josm.openstreetmap.de/wiki/NameTemplate
   preset_name_label: whether to insert "[preset name]" label in dialog
                      (defaults to "false" for backward-compatibility on external presets)
@@ -141,5 +141,5 @@
  The fields description, shortdescription and link may also be localized (e.g. de.link)
 
-See also http://josm.openstreetmap.de/wiki/TaggingPresets.
+See also https://josm.openstreetmap.de/wiki/TaggingPresets.
 
 The fields "name", "text", "display_values" may also be localized (e.g. de.name).
Index: /trunk/josm-latest.jnlp
===================================================================
--- /trunk/josm-latest.jnlp	(revision 6955)
+++ /trunk/josm-latest.jnlp	(revision 6955)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 6.0//EN" "http://java.sun.com/dtd/JNLP-6.0.dtd">
+<jnlp spec="6.0+" codebase="https://josm.openstreetmap.de/download/" href="josm-latest.jnlp">
+    <information>
+        <title>JOSM (development version)</title>
+        <vendor>OpenStreetMap</vendor> 
+        <homepage href="https://josm.openstreetmap.de"/> 
+        <description>Java OpenStreetMap editor</description>
+        <description kind="one-line">JOSM</description>
+        <description kind="tooltip">JOSM</description>
+        <icon href="https://josm.openstreetmap.de/svn/trunk/images/logo.png"/> 
+        <offline-allowed/>
+        <shortcut>
+            <desktop/>
+            <menu/>
+        </shortcut>
+    </information>
+    <security>
+        <all-permissions/>
+    </security>
+    <resources>
+        <j2se version="1.6+"/>
+        <jar href="josm-latest.jar"/>
+        <property name="java.util.Arrays.useLegacyMergeSort" value="true"/>
+    </resources>
+    <application-desc main-class="JOSM"/>
+</jnlp>
Index: /trunk/josm.jnlp
===================================================================
--- /trunk/josm.jnlp	(revision 6954)
+++ /trunk/josm.jnlp	(revision 6955)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc.//DTD JNLP 1.5//EN" "http://java.sun.com/dtd/JNLP-1.5.dtd"> 
-<jnlp spec="1.5.0+" codebase="http://josm.openstreetmap.de/download/" href="josm.jnlp">
+<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 6.0//EN" "http://java.sun.com/dtd/JNLP-6.0.dtd">
+<jnlp spec="6.0+" codebase="https://josm.openstreetmap.de/download/" href="josm.jnlp">
     <information>
         <title>JOSM</title>
         <vendor>OpenStreetMap</vendor> 
-        <homepage href="http://josm.openstreetmap.de/"/> 
+        <homepage href="https://josm.openstreetmap.de"/> 
         <description>Java OpenStreetMap editor</description>
         <description kind="one-line">JOSM</description>
         <description kind="tooltip">JOSM</description>
-        <icon href="http://josm.openstreetmap.de/svn/trunk/images/logo.png"/> 
+        <icon href="https://josm.openstreetmap.de/svn/trunk/images/logo.png"/> 
         <offline-allowed/>
         <shortcut>