diff --git a/build.xml b/build.xml
index 1e15bb8b..2da2ca6a 100644
--- a/build.xml
+++ b/build.xml
@@ -694,104 +694,6 @@
 	</target>
 
 
-	<target name="webstart" depends="jar" description="Build and compress jars used for webstart deployment">
-		<!-- create dirs -->
-		<mkdir dir="${dir.dist}/webstart" />
-
-		<!-- copy jnlp descriptors and icons -->
-		<copy todir="${dir.dist}/webstart">
-			<fileset dir="${dir.installer}/webstart" />
-			<fileset dir="${dir.installer}/icons" />
-		</copy>
-
-		<!-- copy jars -->
-		<copy todir="${dir.dist}/webstart">
-			<fileset dir="${dir.lib}" includes="*.jar" excludes="jna.jar" />
-		</copy>
-
-		<!-- copy jna.jar without native libs -->
-		<jar destfile="${dir.dist}/webstart/jna.jar">
-			<zipfileset src="${dir.lib}/jna.jar" includes="**/*.class" />
-		</jar>
-
-		<!-- create mediainfo jar as seperate jar and use as trigger for lazy loading the native libs -->
-		<jar destfile="${dir.dist}/webstart/mediainfo.jar">
-			<fileset dir="${dir.build}" includes="net/filebot/mediainfo/**" />
-		</jar>
-
-		<!-- create indexed main jar -->
-		<jar destfile="${dir.dist}/webstart/filebot.jar" index="yes">
-			<fileset dir="${dir.build}" excludes="**/*Test*, net/filebot/mediainfo/**" />
-			<indexjars>
-				<!-- IMPORTANT if groovy is indexed things break during runtime!! -->
-				<fileset dir="${dir.dist}/webstart" includes="**/*.jar" excludes="filebot.jar, groovy.jar" />
-			</indexjars>
-		</jar>
-
-		<!-- create native lib jars -->
-		<antcall target="webstart-nativelib">
-			<param name="arch" value="win32-x86" />
-		</antcall>
-		<antcall target="webstart-nativelib">
-			<param name="arch" value="win32-x64" />
-		</antcall>
-		<antcall target="webstart-nativelib">
-			<param name="arch" value="linux-i386" />
-		</antcall>
-		<antcall target="webstart-nativelib">
-			<param name="arch" value="linux-amd64" />
-		</antcall>
-		<antcall target="webstart-nativelib">
-			<param name="arch" value="mac-x86_64" />
-		</antcall>
-
-		<!-- sign all jars -->
-		<apply executable="pack200">
-			<!-- workaround for bug 6575373, see http://bugs.sun.com/view_bug.do?bug_id=6575373 -->
-			<arg line="--segment-limit=-1" />
-			<arg line="--repack" />
-			<srcfile />
-			<fileset dir="${dir.dist}/webstart" includes="**/*.jar" />
-		</apply>
-
-		<signjar alias="filebot" keystore="filebot.keystore" storepass="secret">
-			<fileset id="signjar" dir="${dir.dist}/webstart" includes="**/*.jar" />
-		</signjar>
-
-		<!-- pack200 all jars -->
-		<apply executable="pack200" dest="${dir.dist}/webstart">
-			<!-- workaround for bug 6575373, see http://bugs.sun.com/view_bug.do?bug_id=6575373 -->
-			<arg line="--segment-limit=-1" />
-			<targetfile />
-			<srcfile />
-			<fileset dir="${dir.dist}/webstart" includes="*.jar" />
-			<mapper type="glob" from="*.jar" to="*.jar.pack.gz" />
-		</apply>
-	</target>
-
-
-	<target name="webstart-nativelib">
-		<!-- create temp dir -->
-		<mkdir dir="${dir.dist}/webstart/native/${arch}" />
-
-		<!-- copy native libs to temp dir -->
-		<copy todir="${dir.dist}/webstart/native/${arch}" flatten="true">
-			<zipfileset src="${dir.lib}/jna.jar" includes="com/sun/jna/${arch}/*" />
-			<fileset dir="${dir.lib}/native">
-				<include name="${arch}/**.dll" />
-				<include name="${arch}/**.dylib" />
-				<include name="${arch}/**.so" />
-			</fileset>
-		</copy>
-
-		<!-- create native lib jar -->
-		<jar destfile="${dir.dist}/webstart/native/${arch}.jar" basedir="${dir.dist}/webstart/native/${arch}" />
-
-		<!-- delete temp dir -->
-		<delete dir="${dir.dist}/webstart/native/${arch}" />
-	</target>
-
-
 	<target name="build">
 		<!-- create build dir -->
 		<mkdir dir="${dir.build}" />
diff --git a/installer/webstart/filebot.jnlp b/installer/webstart/filebot.jnlp
deleted file mode 100644
index f9e742bf..00000000
--- a/installer/webstart/filebot.jnlp
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jnlp spec="1.6+" codebase="http://www.filebot.net/webstart/" href="filebot.jnlp">
-	<information>
-		<title>FileBot</title>
-		<vendor>Reinhard Pointner</vendor>
-		<homepage href="http://www.filebot.net" />
-		<description>The ultimate TV and Movie Renamer</description>
-		
-		<icon href="icon48.png" width="48" height="48" />
-		<icon href="icon32.png" width="32" height="32" />
-		<icon href="icon16.png" width="16" height="16" />
-		<icon href="shortcut.ico" kind="shortcut" />
-		<icon href="splash.png" kind="splash" />
-		
-		<offline-allowed />
-	</information>
-	
-	<security>
-		<all-permissions />
-	</security>
-	
-	<update check="background" policy="always" />
-	
-	<resources>
-		<property name="application.deployment"    value="webstart" />
-		<property name="application.update"        value="skip"     />
-		<property name="application.warmup"        value="false"    />
-		<property name="unixfs"                    value="false"    />
-		<property name="useNativeShell"            value="false"    />
-		<property name="useExtendedFileAttributes" value="true"     />
-		<property name="useCreationDate"           value="false"    />
-		<property name="java.net.useSystemProxies" value="true"     />
-		<property name="sun.net.client.defaultConnectTimeout" value="10000" />
-		<property name="sun.net.client.defaultReadTimeout"    value="60000" />
-		
-		
-		<java version="1.7+" />
-		<property name="jnlp.packEnabled"       value="true" />
-		
-		<jar href="filebot.jar"       download="eager" main="true" />
-		<jar href="groovy.jar"        download="eager" />
-		<jar href="icu4j.jar"         download="eager" />
-		<jar href="commons-io.jar"    download="eager" />
-		<jar href="args4j.jar"        download="eager" />
-		<jar href="jna.jar"           download="eager" />
-		<jar href="miglayout-core.jar"  download="eager" />
-		<jar href="miglayout-swing.jar" download="eager" />
-		<jar href="glazedlists.jar"   download="eager" />
-		<jar href="ehcache.jar"       download="eager" />
-		<jar href="simmetrics.jar"    download="eager" />
-		<jar href="slf4j-api.jar"     download="eager" />
-		<jar href="slf4j-jdk14.jar"   download="eager" />
-		<jar href="jgat-custom.jar"   download="eager" />
-		<jar href="xmlrpc.jar"        download="eager" />
-		<jar href="xz.jar"            download="eager" />
-		<jar href="json-simple.jar"   download="lazy" />
-		<jar href="json-io.jar"       download="lazy" />
-		<jar href="junrar-custom.jar" download="lazy" />
-		<jar href="jacksum.jar"       download="lazy" />
-		<jar href="jsoup.jar"         download="lazy" />
-		<jar href="nekohtml.jar"      download="lazy" part="scraper" />
-		<jar href="xercesMinimal.jar"    download="lazy" part="scraper" />
-		<jar href="mediainfo.jar"        download="lazy" part="native"  />
-		<jar href="sevenzipjbinding.jar" download="lazy" part="native"  />
-		<jar href="rsyntaxtextarea.jar"  download="eager" />
-	</resources>
-	
-	<resources os="Windows" arch="x86">
-		<nativelib href="native/win32-x86.jar"   download="lazy" part="native" />
-	</resources>
-	<resources os="Windows" arch="amd64">
-		<nativelib href="native/win32-x64.jar"   download="lazy" part="native" />
-	</resources>
-	<resources os="Linux" arch="i686">
-		<nativelib href="native/linux-i686.jar"  download="lazy" part="native" />
-	</resources>
-	<resources os="Linux" arch="amd64">
-		<nativelib href="native/linux-amd64.jar" download="lazy" part="native" />
-	</resources>
-	<resources os="Mac" arch="x86_64">
-		<nativelib href="native/mac-x86_64.jar"  download="lazy" part="native" />
-	</resources>
-	
-	<application-desc main-class="net.filebot.Main" />
-</jnlp>