diff --git a/build.xml b/build.xml
index 904a1ad3..54830fb8 100644
--- a/build.xml
+++ b/build.xml
@@ -127,10 +127,6 @@
 				<include name="META-INF/services/**" />
 			</zipfileset>
 
-			<zipfileset src="${dir.lib}/ivy.jar">
-				<include name="org/apache/ivy/**" />
-			</zipfileset>
-
 			<zipfileset src="${dir.lib}/icu4j.jar">
 				<include name="com/ibm/icu/**" />
 			</zipfileset>
@@ -150,6 +146,39 @@
 			<zipfileset src="${dir.lib}/sevenzipjbinding.jar">
 				<include name="net/sf/sevenzipjbinding/**" />
 			</zipfileset>
+			
+			<!-- Ivy for @Grapes automatic dependency management -->
+			<zipfileset src="${dir.lib}/scripting/ivy.jar">
+				<include name="org/apache/ivy/**" />
+			</zipfileset>
+			
+			<!-- AntBuilder including dependencies for ant-javamail, ant-commons-net and ant-jsch -->
+			<zipfileset src="${dir.lib}/scripting/ant.jar">
+				<include name="org/apache/tools/**" />
+			</zipfileset>
+			<zipfileset src="${dir.lib}/scripting/ant-launcher.jar">
+				<include name="org/apache/tools/**" />
+			</zipfileset>
+			<zipfileset src="${dir.lib}/scripting/ant-commons-net.jar">
+				<include name="org/apache/tools/**" />
+			</zipfileset>
+			<zipfileset src="${dir.lib}/scripting/ant-jsch.jar">
+				<include name="org/apache/tools/**" />
+			</zipfileset>
+			<zipfileset src="${dir.lib}/scripting/ant-javamail.jar">
+				<include name="org/apache/tools/**" />
+			</zipfileset>
+			<zipfileset src="${dir.lib}/scripting/commons-net.jar">
+				<include name="org/apache/commons/net/**" />
+			</zipfileset>
+			<zipfileset src="${dir.lib}/scripting/jsch.jar">
+				<include name="com/jcraft/jsch/**" />
+			</zipfileset>
+			<zipfileset src="${dir.lib}/scripting/mail.jar">
+				<include name="javax/mail/**" />
+				<include name="com/sun/mail/**" />
+				<include name="META-INF/*mail*" />
+			</zipfileset>
 		</jar>
 	</target>
 
diff --git a/installer/webstart/filebot.jnlp b/installer/webstart/filebot.jnlp
index 4bfd3393..37231ebd 100644
--- a/installer/webstart/filebot.jnlp
+++ b/installer/webstart/filebot.jnlp
@@ -40,9 +40,9 @@
 		<jar href="slf4j.jar"         download="eager" />
 		<jar href="slf4j-jdk.jar"     download="eager" />
 		<jar href="jgat-custom.jar"   download="eager" />
-		<jar href="json-simple.jar"   download="lazy" />
 		<jar href="xmlrpc.jar"        download="eager" />
 		<jar href="sublight-ws.jar"   download="eager" />
+		<jar href="json-simple.jar"   download="lazy" />
 		<jar href="junrar-custom.jar" download="lazy" />
 		<jar href="nekohtml.jar"      download="lazy" part="scraper" />
 		<jar href="xercesImpl.jar"    download="lazy" part="scraper" />
@@ -66,5 +66,5 @@
 		<nativelib href="native/mac-x86_64.jar"  download="lazy" part="native" />
 	</resources>
 	
-	<application-desc main-class="net.sourceforge.filebot.ApplicationStarter" />
+	<application-desc main-class="net.sourceforge.filebot.Main" />
 </jnlp>
diff --git a/lib/scripting/ant-commons-net.jar b/lib/scripting/ant-commons-net.jar
new file mode 100644
index 00000000..6301c452
Binary files /dev/null and b/lib/scripting/ant-commons-net.jar differ
diff --git a/lib/scripting/ant-javamail.jar b/lib/scripting/ant-javamail.jar
new file mode 100644
index 00000000..4dc6de3a
Binary files /dev/null and b/lib/scripting/ant-javamail.jar differ
diff --git a/lib/scripting/ant-jsch.jar b/lib/scripting/ant-jsch.jar
new file mode 100644
index 00000000..9420414e
Binary files /dev/null and b/lib/scripting/ant-jsch.jar differ
diff --git a/lib/scripting/ant-launcher.jar b/lib/scripting/ant-launcher.jar
new file mode 100644
index 00000000..6cdbe6a6
Binary files /dev/null and b/lib/scripting/ant-launcher.jar differ
diff --git a/lib/scripting/ant.jar b/lib/scripting/ant.jar
new file mode 100644
index 00000000..b3a94dfa
Binary files /dev/null and b/lib/scripting/ant.jar differ
diff --git a/lib/scripting/commons-net.jar b/lib/scripting/commons-net.jar
new file mode 100644
index 00000000..b75f1a51
Binary files /dev/null and b/lib/scripting/commons-net.jar differ
diff --git a/lib/ivy.jar b/lib/scripting/ivy.jar
similarity index 100%
rename from lib/ivy.jar
rename to lib/scripting/ivy.jar
diff --git a/lib/scripting/jsch.jar b/lib/scripting/jsch.jar
new file mode 100644
index 00000000..448c5dc7
Binary files /dev/null and b/lib/scripting/jsch.jar differ
diff --git a/lib/scripting/mail.jar b/lib/scripting/mail.jar
new file mode 100644
index 00000000..300f436a
Binary files /dev/null and b/lib/scripting/mail.jar differ