diff --git a/lib/js.jar b/lib/js.jar
new file mode 100644
index 0000000000000000000000000000000000000000..2b926505d024e480e00e18ed2dbeb4359591a8ed
Binary files /dev/null and b/lib/js.jar differ
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 96cde658fce689d863f6a3264cc2e1e98df6d614..45d133405f9f451a15a87672f914a36349232b37 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -45,6 +45,7 @@ endorsed.classpath=
 excludes=
 file.reference.commons-net-3.1.jar=lib/commons-net-3.1.jar
 file.reference.jna.jar=lib/jna.jar
+file.reference.js.jar=lib/js.jar
 file.reference.purejavacomm.jar=lib/purejavacomm.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
@@ -53,7 +54,8 @@ jar.index=${jnlp.enabled}
 javac.classpath=\
     ${file.reference.commons-net-3.1.jar}:\
     ${file.reference.jna.jar}:\
-    ${file.reference.purejavacomm.jar}
+    ${file.reference.purejavacomm.jar}:\
+    ${file.reference.js.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/src/com/t_oster/liblasercut/laserscript/ScriptInterpreter.java b/src/com/t_oster/liblasercut/laserscript/ScriptInterpreter.java
index 9aadd1bfc2dd5a5664562239dd114f8f2ecc40e3..e14593b07476fd7c403a3b59c7400ee19471752e 100644
--- a/src/com/t_oster/liblasercut/laserscript/ScriptInterpreter.java
+++ b/src/com/t_oster/liblasercut/laserscript/ScriptInterpreter.java
@@ -23,11 +23,11 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
 import javax.script.ScriptException;
-import sun.org.mozilla.javascript.Context;
-import sun.org.mozilla.javascript.ContextFactory;
-import sun.org.mozilla.javascript.NativeJavaObject;
-import sun.org.mozilla.javascript.Scriptable;
-import sun.org.mozilla.javascript.WrapFactory;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.ContextFactory;
+import org.mozilla.javascript.NativeJavaObject;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.WrapFactory;
 
 /**
  * This class provides a JavaScript interpreter which is pretty sandboxed.
@@ -95,7 +95,7 @@ public class ScriptInterpreter
     {
       ContextFactory.initGlobal(new SandboxContextFactory());
     }
-    Context cx = ContextFactory.getGlobal().enterContext();
+    Context cx = ContextFactory.getGlobal().enter();
     try
     {
       cx.setClassShutter(ScriptingSecurity.getInstance());
diff --git a/src/com/t_oster/liblasercut/laserscript/ScriptingSecurity.java b/src/com/t_oster/liblasercut/laserscript/ScriptingSecurity.java
index 71adf327ac764cc3dcd50855edac7be0c66d7e7d..d7b076b05c4b1287e6c2a706562e0bef19c5b699 100644
--- a/src/com/t_oster/liblasercut/laserscript/ScriptingSecurity.java
+++ b/src/com/t_oster/liblasercut/laserscript/ScriptingSecurity.java
@@ -18,7 +18,7 @@
  **/
 package com.t_oster.liblasercut.laserscript;
 
-import sun.org.mozilla.javascript.ClassShutter;
+import org.mozilla.javascript.ClassShutter;
 
 /**
  *