diff --git a/lib/jetty-ajp-7.6.2.v20120308.jar b/lib/jetty-ajp-7.6.2.v20120308.jar
new file mode 100644
index 00000000..73e38cb0
Binary files /dev/null and b/lib/jetty-ajp-7.6.2.v20120308.jar differ
diff --git a/lib/jetty-ajp.jar b/lib/jetty-ajp.jar
deleted file mode 100644
index 880adc06..00000000
Binary files a/lib/jetty-ajp.jar and /dev/null differ
diff --git a/lib/jetty-continuation-7.6.2.v20120308.jar b/lib/jetty-continuation-7.6.2.v20120308.jar
new file mode 100644
index 00000000..011708b7
Binary files /dev/null and b/lib/jetty-continuation-7.6.2.v20120308.jar differ
diff --git a/lib/jetty-http-7.6.2.v20120308.jar b/lib/jetty-http-7.6.2.v20120308.jar
new file mode 100644
index 00000000..277712e4
Binary files /dev/null and b/lib/jetty-http-7.6.2.v20120308.jar differ
diff --git a/lib/jetty-io-7.6.2.v20120308.jar b/lib/jetty-io-7.6.2.v20120308.jar
new file mode 100644
index 00000000..c7e52918
Binary files /dev/null and b/lib/jetty-io-7.6.2.v20120308.jar differ
diff --git a/lib/jetty-security-7.6.2.v20120308.jar b/lib/jetty-security-7.6.2.v20120308.jar
new file mode 100644
index 00000000..12a71937
Binary files /dev/null and b/lib/jetty-security-7.6.2.v20120308.jar differ
diff --git a/lib/jetty-server-7.6.2.v20120308.jar b/lib/jetty-server-7.6.2.v20120308.jar
new file mode 100644
index 00000000..4ed92ef6
Binary files /dev/null and b/lib/jetty-server-7.6.2.v20120308.jar differ
diff --git a/lib/jetty-servlet-7.6.2.v20120308.jar b/lib/jetty-servlet-7.6.2.v20120308.jar
new file mode 100644
index 00000000..93edeadc
Binary files /dev/null and b/lib/jetty-servlet-7.6.2.v20120308.jar differ
diff --git a/lib/jetty-util-7.6.2.v20120308.jar b/lib/jetty-util-7.6.2.v20120308.jar
new file mode 100644
index 00000000..61407b83
Binary files /dev/null and b/lib/jetty-util-7.6.2.v20120308.jar differ
diff --git a/lib/jetty-util.jar b/lib/jetty-util.jar
deleted file mode 100644
index 2a780583..00000000
Binary files a/lib/jetty-util.jar and /dev/null differ
diff --git a/lib/jetty-xml-7.6.2.v20120308.jar b/lib/jetty-xml-7.6.2.v20120308.jar
new file mode 100644
index 00000000..e489ad9f
Binary files /dev/null and b/lib/jetty-xml-7.6.2.v20120308.jar differ
diff --git a/lib/jetty.jar b/lib/jetty.jar
deleted file mode 100644
index 1acfa7af..00000000
Binary files a/lib/jetty.jar and /dev/null differ
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
new file mode 100644
index 00000000..681a0687
Binary files /dev/null and b/lib/servlet-api-2.5.jar differ
diff --git a/lib/servlet.jar b/lib/servlet.jar
deleted file mode 100644
index b0537c4d..00000000
Binary files a/lib/servlet.jar and /dev/null differ
diff --git a/src/helma/main/launcher/Main.java b/src/helma/main/launcher/Main.java
index 960608f9..3073ac18 100644
--- a/src/helma/main/launcher/Main.java
+++ b/src/helma/main/launcher/Main.java
@@ -35,14 +35,17 @@ import java.util.ArrayList;
  */
 public class Main {
     public static final String[] jars = {
-                                            "helma.jar", "rhino.jar", "jetty.jar",
-                                            "jetty-util.jar", "jetty-ajp.jar",
+                                            "helma.jar", "rhino.jar",
                                             "commons-logging.jar", "crimson.jar",
-                                            "xmlrpc.jar", "servlet.jar",
-                                            "mail.jar", "activation.jar",
+                                            "xmlrpc.jar", "mail.jar", "activation.jar",
                                             "commons-fileupload.jar", "commons-codec.jar",
-                                            "commons-io.jar", "commons-net.jar", 
-                                            "tagsoup.jar"
+                                            "commons-io.jar", "commons-net.jar",
+                                            "tagsoup.jar", "servlet-api-2.5.jar",
+                                            "jetty-ajp-7.6.2.v20120308.jar", "jetty-continuation-7.6.2.v20120308.jar",
+                                            "jetty-http-7.6.2.v20120308.jar", "jetty-io-7.6.2.v20120308.jar",
+                                            "jetty-security-7.6.2.v20120308.jar", "jetty-server-7.6.2.v20120308.jar",
+                                            "jetty-servlet-7.6.2.v20120308.jar", "jetty-util-7.6.2.v20120308.jar",
+                                            "jetty-xml-7.6.2.v20120308.jar",
                                         };
 
     private Class serverClass;
@@ -122,8 +125,8 @@ public class Main {
     }
 
     /**
-     * Create a server-wide ClassLoader from our install directory. 
-     * This will be used as parent ClassLoader for all application 
+     * Create a server-wide ClassLoader from our install directory.
+     * This will be used as parent ClassLoader for all application
      * ClassLoaders.
      *
      * @param installDir