diff --git a/build.xml b/build.xml
index 1c26353e..c57de3f7 100644
--- a/build.xml
+++ b/build.xml
@@ -525,49 +525,55 @@
 
 
 	<target name="deb" description="Build Debian Linux packages" depends="revision">
+		<!-- arch i686 not allowed by deb specification, must be i386 for 32-bit x86 systems -->
 		<antcall target="deb-arch">
 			<param name="arch" value="i686" />
-			<!-- arch i686 not allowed by deb specification, must be i386 for 32-bit x86 systems -->
 			<param name="deb.arch" value="i386" />
+			<param name="deb.pkg" value="deb" />
+			<param name="deb.prefix" value="/usr" />
 		</antcall>
 		<antcall target="deb-arch">
 			<param name="arch" value="amd64" />
 			<param name="deb.arch" value="amd64" />
+			<param name="deb.pkg" value="deb" />
+			<param name="deb.prefix" value="/usr" />
+		</antcall>
+	</target>
+
+
+	<target name="ipkg" description="Build embedded Linux packages" depends="revision">
+		<antcall target="deb-arch">
+			<param name="arch" value="noarch" />
+			<param name="deb.arch" value="noarch" />
+			<param name="deb.pkg" value="ipk" />
+			<param name="deb.prefix" value="/opt" />
 		</antcall>
 	</target>
 
 
 	<target name="deb-arch">
-		<!-- stage created .deb files in a temporary folder -->
-		<property name="deb.staging" location="${dir.dist}/deb" />
-		<mkdir dir="${deb.staging}" />
-		<deb debfilenameproperty="staging.file.deb" todir="${deb.staging}" package="filebot" version="${version}" architecture="${deb.arch}" section="misc" homepage="http://www.filebot.net/" priority="optional" postinst="${dir.installer}/deb/postinst.sh" prerm="${dir.installer}/deb/prerm.sh">
-			<maintainer name="Reinhard Pointner" email="maintainer@filebot.net" />
-			<description synopsis="The ultimate TV and Movie Renamer">FileBot is the ultimate tool for renaming your movies, tv shows or anime and even downloading subtitles. It's smart, streamlined for simplicity and just works. Putting the super-efficient UI aside, it's also got a full-featured command-line interface and scripting engine for all sorts of automation. Anything is possible.</description>
-			<tarfileset fullpath="usr/share/filebot/FileBot.jar" file="${path.fatjar}" />
-			<tarfileset prefix="usr/share/filebot" dir="${dir.lib}/native/linux-${arch}" includes="*.so" />
-			<tarfileset prefix="usr/share/filebot" file="${dir.lib}/native/linux-${arch}/fpcalc" filemode="755" />
-			<tarfileset prefix="usr/share/filebot" file="${dir.installer}/icons/icon.svg" />
-			<tarfileset prefix="usr/share/filebot/bin" file="${dir.installer}/deb/filebot.sh" filemode="755" />
-			<tarfileset prefix="usr/share/applications" file="${dir.installer}/deb/FileBot.desktop" />
-		</deb>
-		<move tofile="${dir.dist}/filebot_${version}_${deb.arch}.deb" file="${staging.file.deb}" overwrite="no" failonerror="yes" />
-		<delete dir="${deb.staging}" />
-	</target>
+		<property name="dir.staging" location="${dir.dist}/${deb.pkg}/${arch}" />
 
+		<copy todir="${dir.staging}" overwrite="yes" encoding="UTF-8" verbose="true">
+			<fileset dir="${dir.installer}/deb/${deb.pkg}" />
+			<fileset dir="${dir.installer}/deb" includes="control/**" />
+			<filterset begintoken="@{" endtoken="}">
+				<propertyset>
+					<propertyref builtin="all" />
+				</propertyset>
+			</filterset>
+		</copy>
+		<copy todir="${dir.staging}" verbose="true" failonerror="false">
+			<fileset dir="${dir.lib}/native/linux-${arch}" />
+			<fileset file="${dir.installer}/icons/icon.svg" />
+		</copy>
+		<copy file="${path.fatjar}" tofile="${dir.staging}/FileBot.jar" verbose="true" />
 
-	<target name="ipkg" description="Build embedded Linux packages" depends="revision">
-		<!-- stage created .deb files in a temporary folder -->
-		<property name="ipkg.staging" location="${dir.dist}/deb-ipkg" />
-		<mkdir dir="${ipkg.staging}" />
-		<deb debfilenameproperty="staging.file.deb" todir="${ipkg.staging}" package="filebot" version="${version}" architecture="noarch" section="misc" homepage="http://www.filebot.net/" priority="optional" postinst="${dir.installer}/ipkg/postinst.sh" prerm="${dir.installer}/ipkg/prerm.sh">
-			<maintainer name="Reinhard Pointner" email="maintainer@filebot.net" />
-			<description synopsis="The ultimate TV and Movie Renamer">FileBot is the ultimate tool for renaming your movies, tv shows or anime and even downloading subtitles. It's smart, streamlined for simplicity and just works. Putting the super-efficient UI aside, it's also got a full-featured command-line interface and scripting engine for all sorts of automation. Anything is possible.</description>
-			<tarfileset fullpath="opt/share/filebot/FileBot.jar" file="${path.fatjar}" />
-			<tarfileset prefix="opt/share/filebot/bin" file="${dir.installer}/ipkg/filebot.sh" filemode="755" />
-		</deb>
-		<move tofile="${dir.dist}/filebot_${version}_noarch.ipk" file="${staging.file.deb}" overwrite="no" failonerror="yes" />
-		<delete dir="${ipkg.staging}" />
+		<jdeb destfile="${dir.dist}/filebot_${version}_${deb.arch}.${deb.pkg}" control="${dir.staging}/control" compression="gz" changesIn="${dir.staging}/changes.txt" changesOut="${dir.dist}/filebot_${version}_${deb.arch}.${deb.pkg}.changes" verbose="true">
+			<tarfileset prefix="${deb.prefix}/share/filebot" dir="${dir.staging}" includes="*.sh, fpcalc" filemode="755" />
+			<tarfileset prefix="${deb.prefix}/share/filebot" dir="${dir.staging}" includes="*.jar, *.so, *.svg" />
+			<tarfileset prefix="${deb.prefix}/share/applications" dir="${dir.staging}" includes="*.desktop" />
+		</jdeb>
 	</target>
 
 
@@ -737,7 +743,7 @@
 		</path>
 		<taskdef uri="antlib:org.apache.ant.compress" resource="org/apache/ant/compress/antlib.xml" classpathref="lib.classpath" />
 		<taskdef resource="net/filebot/ant/spk/antlib.xml" classpathref="lib.classpath" />
-		<taskdef resource="com/googlecode/ant_deb_task/antlib.xml" classpathref="lib.classpath" />
+		<taskdef resource="org/vafer/jdeb/ant/antlib.xml" classpathref="lib.classpath" />
 		<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpathref="lib.classpath" />
 	</target>
 
@@ -916,8 +922,8 @@
 	<target name="deploy-beta-release" description="Build and deploy the latest release files">
 		<input addproperty="mark" message="Mark:" />
 		<antcall target="deploy-release">
-			<param name="dir.release" location="${dir.dist}/release/${title}_${version}_${mark}" />
-			<param name="dir.cache" location="${dir.dist}/cache/${title}_${version}_${mark}" />
+			<param name="dir.release" location="${dir.dist}/beta/release/${title}_${version}_${mark}" />
+			<param name="dir.cache" location="${dir.dist}/beta/cache/${title}_${version}_${mark}" />
 			<param name="deploy.release" value="${deploy.release}/HEAD" />
 		</antcall>
 	</target>
diff --git a/installer/deb/FileBot.desktop b/installer/deb/FileBot.desktop
deleted file mode 100644
index 119e61ab..00000000
--- a/installer/deb/FileBot.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=FileBot
-Comment=Rename Movies or TV Shows and download Subtitles
-Type=Application
-Exec=/usr/share/filebot/bin/filebot.sh
-Icon=/usr/share/filebot/icon.svg
-Terminal=false
-StartupNotify=true
-Categories=AudioVideo;Video;FileTools;Java
diff --git a/installer/deb/control/control b/installer/deb/control/control
new file mode 100644
index 00000000..1361ddfa
--- /dev/null
+++ b/installer/deb/control/control
@@ -0,0 +1,8 @@
+Package: filebot
+Version: @{version}
+Architecture: @{deb.arch}
+Maintainer: Reinhard Pointner <maintainer@filebot.net>
+Description: The ultimate TV and Movie Renamer
+Homepage: http://www.filebot.net/
+Section: utils
+Priority: extra
diff --git a/installer/deb/control/postinst b/installer/deb/control/postinst
new file mode 100644
index 00000000..498f3e75
--- /dev/null
+++ b/installer/deb/control/postinst
@@ -0,0 +1,2 @@
+#!/bin/sh
+ln -sf @{deb.prefix}/share/filebot/filebot.sh @{deb.prefix}/bin/filebot
diff --git a/installer/deb/control/prerm b/installer/deb/control/prerm
new file mode 100644
index 00000000..75bc16ce
--- /dev/null
+++ b/installer/deb/control/prerm
@@ -0,0 +1,2 @@
+#!/bin/sh
+rm -f @{deb.prefix}/bin/filebot
diff --git a/installer/deb/deb/FileBot.desktop b/installer/deb/deb/FileBot.desktop
new file mode 100644
index 00000000..9967c4f6
--- /dev/null
+++ b/installer/deb/deb/FileBot.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=FileBot
+Comment=The ultimate TV and Movie Renamer
+Type=Application
+Exec=@{deb.prefix}/share/filebot/filebot.sh
+Icon=@{deb.prefix}/share/filebot/icon.svg
+Terminal=false
+StartupNotify=true
+Categories=AudioVideo;Video;FileTools
diff --git a/installer/deb/filebot.sh b/installer/deb/deb/filebot.sh
similarity index 94%
rename from installer/deb/filebot.sh
rename to installer/deb/deb/filebot.sh
index b5c7d4e2..ab0b5600 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/deb/filebot.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-APP_ROOT="/usr/share/filebot"
+APP_ROOT=@{deb.prefix}/share/filebot
 
 if [ -z "$HOME" ]; then
 	echo '$HOME must be set'
diff --git a/installer/ipkg/filebot.sh b/installer/deb/ipk/filebot.sh
similarity index 96%
rename from installer/ipkg/filebot.sh
rename to installer/deb/ipk/filebot.sh
index 6680fcba..7523408c 100644
--- a/installer/ipkg/filebot.sh
+++ b/installer/deb/ipk/filebot.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-APP_ROOT="/opt/share/filebot"
+APP_ROOT=@{deb.prefix}/share/filebot
 
 # make sure required environment variables are set
 if [ -z "$USER" ]; then
diff --git a/installer/deb/postinst.sh b/installer/deb/postinst.sh
deleted file mode 100644
index fb566a20..00000000
--- a/installer/deb/postinst.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# create /bin symlink
-ln -s -f /usr/share/filebot/bin/filebot.sh /usr/bin/filebot
diff --git a/installer/deb/prerm.sh b/installer/deb/prerm.sh
deleted file mode 100644
index a07e2b39..00000000
--- a/installer/deb/prerm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# remove /bin symlink
-rm -f /usr/bin/filebot
diff --git a/installer/ipkg/postinst.sh b/installer/ipkg/postinst.sh
deleted file mode 100644
index b10aaa63..00000000
--- a/installer/ipkg/postinst.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# create /bin symlink
-ln -s -f /opt/share/filebot/bin/filebot.sh /opt/bin/filebot
diff --git a/installer/ipkg/prerm.sh b/installer/ipkg/prerm.sh
deleted file mode 100644
index 5e71bc50..00000000
--- a/installer/ipkg/prerm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# remove /bin symlink
-rm -f /opt/bin/filebot
diff --git a/ivy.xml b/ivy.xml
index 187d4246..2885600b 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -38,5 +38,6 @@
 		<dependency rev="latest.release" org="org.apache.ant" name="ant-junit" />
 		<dependency rev="latest.release" org="org.apache.commons" name="commons-compress" />
 		<dependency rev="latest.release" org="net.filebot" name="ant-spk" />
+		<dependency rev="latest.release" org="org.vafer" name="jdeb" />
 	</dependencies>
 </ivy-module>
diff --git a/lib/jars/ant-deb.jar b/lib/jars/ant-deb.jar
deleted file mode 100644
index 4625436e..00000000
Binary files a/lib/jars/ant-deb.jar and /dev/null differ
diff --git a/lib/jars/ant-spk.jar b/lib/jars/ant-spk.jar
deleted file mode 100644
index aae8498a..00000000
Binary files a/lib/jars/ant-spk.jar and /dev/null differ