diff --git a/packaging/lib-local/launch4j-3.13-SNAPSHOT-core.jar b/packaging/lib-local/launch4j-3.13-SNAPSHOT-core.jar
new file mode 100644
index 000000000..fb1e0ad77
Binary files /dev/null and b/packaging/lib-local/launch4j-3.13-SNAPSHOT-core.jar differ
diff --git a/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux.jar b/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux.jar
new file mode 100644
index 000000000..828bab382
Binary files /dev/null and b/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux.jar differ
diff --git a/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux64.jar b/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux64.jar
new file mode 100644
index 000000000..30bec52df
Binary files /dev/null and b/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux64.jar differ
diff --git a/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-mac.jar b/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-mac.jar
new file mode 100644
index 000000000..069769abf
Binary files /dev/null and b/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-mac.jar differ
diff --git a/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-win32.jar b/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-win32.jar
new file mode 100644
index 000000000..4bb742b9e
Binary files /dev/null and b/packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-win32.jar differ
diff --git a/packaging/openrefine.ico b/packaging/openrefine.ico
new file mode 100644
index 000000000..e68371fd9
Binary files /dev/null and b/packaging/openrefine.ico differ
diff --git a/packaging/pom.xml b/packaging/pom.xml
index d330d5e56..57fa9fe32 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -23,6 +23,105 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <version>2.5.2</version>
+        <executions>
+            <!-- This is a clean snapshot of launch4j's master branch,
+                which includes fixes to Java discovery that we need
+                to support recent versions of Java. When launch4j-3.13
+                is officially released, remove this and the locally stored
+                jars -->
+            <execution>
+                <id>install-launch4j-core</id>
+                <phase>process-resources</phase>
+                <configuration>
+                    <file>${basedir}/lib-local/launch4j-3.13-SNAPSHOT-core.jar</file>
+                    <repositoryLayout>default</repositoryLayout>
+                    <groupId>net.sf.launch4j</groupId>
+                    <artifactId>launch4j</artifactId>
+                    <classifier>core</classifier>
+                    <version>3.13-SNAPSHOT</version>
+                    <packaging>jar</packaging>
+                    <generatePom>true</generatePom>
+                </configuration>
+                <goals>
+                    <goal>install-file</goal>
+                </goals>
+            </execution>
+            <execution>
+                <id>install-launch4j-linux64</id>
+                <phase>process-resources</phase>
+                <configuration>
+                    <file>${basedir}/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux64.jar</file>
+                    <repositoryLayout>default</repositoryLayout>
+                    <groupId>net.sf.launch4j</groupId>
+                    <artifactId>launch4j</artifactId>
+                    <classifier>workdir-linux64</classifier>
+                    <version>3.13-SNAPSHOT</version>
+                    <packaging>jar</packaging>
+                    <generatePom>true</generatePom>
+                </configuration>
+                <goals>
+                    <goal>install-file</goal>
+                </goals>
+            </execution>
+            <execution>
+                <id>install-launch4j-linux</id>
+                <phase>process-resources</phase>
+                <configuration>
+                    <file>${basedir}/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux.jar</file>
+                    <repositoryLayout>default</repositoryLayout>
+                    <groupId>net.sf.launch4j</groupId>
+                    <artifactId>launch4j</artifactId>
+                    <classifier>workdir-linux</classifier>
+                    <version>3.13-SNAPSHOT</version>
+                    <packaging>jar</packaging>
+                    <generatePom>true</generatePom>
+                </configuration>
+                <goals>
+                    <goal>install-file</goal>
+                </goals>
+            </execution>
+            <execution>
+                <id>install-launch4j-win32</id>
+                <phase>process-resources</phase>
+                <configuration>
+                    <file>${basedir}/lib-local/launch4j-3.13-SNAPSHOT-workdir-win32.jar</file>
+                    <repositoryLayout>default</repositoryLayout>
+                    <groupId>net.sf.launch4j</groupId>
+                    <artifactId>launch4j</artifactId>
+                    <classifier>workdir-win32</classifier>
+                    <version>3.13-SNAPSHOT</version>
+                    <packaging>jar</packaging>
+                    <generatePom>true</generatePom>
+                </configuration>
+                <goals>
+                    <goal>install-file</goal>
+                </goals>
+            </execution>
+            <execution>
+                <id>install-launch4j-mac</id>
+                <phase>process-resources</phase>
+                <configuration>
+                    <file>${basedir}/lib-local/launch4j-3.13-SNAPSHOT-workdir-mac.jar</file>
+                    <repositoryLayout>default</repositoryLayout>
+                    <groupId>net.sf.launch4j</groupId>
+                    <artifactId>launch4j</artifactId>
+                    <classifier>workdir-mac</classifier>
+                    <version>3.13-SNAPSHOT</version>
+                    <packaging>jar</packaging>
+                    <generatePom>true</generatePom>
+                </configuration>
+                <goals>
+                    <goal>install-file</goal>
+                </goals>
+            </execution>
+
+
+        </executions>
+      </plugin>
       <plugin> <!-- necessary for launch4j -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -95,6 +194,25 @@
         <groupId>com.akathist.maven.plugins.launch4j</groupId>
         <artifactId>launch4j-maven-plugin</artifactId>
         <version>1.7.25</version>
+
+            <!-- This is a clean snapshot of launch4j's master branch,
+                which includes fixes to Java discovery that we need
+                to support recent versions of Java.
+                When the maven plugin is updated to use launch4j-3.13,
+                this can be removed. -->
+        <dependencies>
+          <dependency>
+            <groupId>net.sf.launch4j</groupId>
+            <artifactId>launch4j</artifactId>
+            <classifier>core</classifier>
+            <version>3.13-SNAPSHOT</version>
+          </dependency>
+          <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+          <version>1.4.9</version>
+        </dependency>
+        </dependencies>
         <executions>
           <execution>
             <id>l4j-clui</id>
@@ -106,6 +224,7 @@
               <jar>server/target/lib/openrefine-${project.version}-server.jar</jar>
               <dontWrapJar>true</dontWrapJar>
               <saveConfig>true</saveConfig>
+              <icon>openrefine.ico</icon>
               <classPath>
                 <mainClass>com.google.refine.Refine</mainClass>
                 <jarLocation>server/target/lib/</jarLocation>
@@ -114,7 +233,7 @@
               <jre>
                 <path>%JAVA_HOME%;%PATH%</path>
                 <minVersion>1.8.0</minVersion>
-                <jdkPreference>preferJre</jdkPreference>
+                <bundledJreAsFallback>true</bundledJreAsFallback>
                 <initialHeapSize>512</initialHeapSize>
                 <maxHeapSize>2048</maxHeapSize>
                 <opts>