diff --git a/build.gradle b/build.gradle
index 25da9cc2..0ab6c4c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,19 +8,19 @@ repositories {
 }
 
 dependencies {
-  // Potential replacement for apache-dom
-  //compile group: 'xerces', name: 'xercesImpl', version: '2.11.0'
   compile group: 'commons-codec', name: 'commons-codec', version: '1.10'
   compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.2'
   compile group: 'commons-logging', name: 'commons-logging', version: '1.2'
   compile group: 'commons-net', name: 'commons-net', version: '3.6'
+  compile group: 'javax.mail', name: 'mail', version: '1.4.7'
   compile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'
+  compile group: 'org.ccil.cowan.tagsoup', name: 'tagsoup', version: '1.2.1'
   compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.3.v20170317'
   compile group: 'org.eclipse.jetty', name: 'jetty-xml', version: '9.4.3.v20170317'
-  compile group: 'javax.mail', name: 'mail', version: '1.4.7'
   compile group: 'org.mozilla', name: 'rhino', version: '1.7.7.1'
-  compile group: 'org.ccil.cowan.tagsoup', name: 'tagsoup', version: '1.2.1'
-  compile group: 'xmlrpc', name: 'xmlrpc', version: '2.0.1'
+  compile group: 'xerces', name: 'xercesImpl', version: '2.11.0'
+  // Potential replacement for apache-dom
+  //compile group: 'xmlrpc', name: 'xmlrpc', version: '2.0.1'
 }
 
 task deps(type: Copy) {
diff --git a/src/helma/main/launcher/Main.java b/src/helma/main/launcher/Main.java
index e9805faf..19559e47 100644
--- a/src/helma/main/launcher/Main.java
+++ b/src/helma/main/launcher/Main.java
@@ -35,17 +35,12 @@ import java.util.ArrayList;
  */
 public class Main {
     public static final String[] jars = {
-        "helma.jar",
-        "rhino-1.7.7.1.jar",
-        "commons-logging-1.2.jar",
-        "xmlrpc-2.0.1.jar",
-        "mail-1.4.7.jar",
-        "activation-1.1.jar",
-        "commons-fileupload-1.3.2.jar",
         "commons-codec-1-10.jar",
+        "commons-fileupload-1.3.2.jar",
         "commons-io-2.2.jar",
-        "commons-net-3.6.jar",
-        "tagsoup-1.2.1.jar",
+        "commons-logging-1.2.jar",
+        "commons-net-3.5.jar",
+        "helma.jar",
         "javax.servlet-api-3.1.0.jar",
         "jetty-http-9.4.3.v20170317.jar",
         "jetty-io-9.4.3.v20170317.jar",
@@ -53,7 +48,11 @@ public class Main {
         "jetty-server-9.4.3.v20170317.jar",
         "jetty-servlet-9.4.3.v20170317.jar",
         "jetty-util-9.4.3.v20170317.jar",
-        "jetty-xml-9.4.3.v20170317.jar"
+        "jetty-xml-9.4.3.v20170317.jar",
+        "mail-1.4.7.jar",
+        "rhino-1.7.7.1.jar",
+        "tagsoup-1.2.1.jar",
+        "xmlrpc-2.0.1.jar"
     };
 
     private Class serverClass;