diff --git a/build.xml b/build.xml
index 5ecd7f96..fc70e1ac 100644
--- a/build.xml
+++ b/build.xml
@@ -310,11 +310,11 @@
 
 	<target name="ppa-binary" depends="svn-update">
 		<tar longfile="gnu" compression="gzip" destfile="${path.ubuntu-binary.tar.gz}">
-			<tarfileset fullpath="i386/opt/filebot/FileBot.jar" file="${path.fatjar}" />
+			<tarfileset fullpath="i686/opt/filebot/FileBot.jar" file="${path.fatjar}" />
 			<tarfileset fullpath="amd64/opt/filebot/FileBot.jar" file="${path.fatjar}" />
-			<tarfileset prefix="i386/opt/filebot" dir="${dir.lib}/native/linux-i386" includes="*.so" />
+			<tarfileset prefix="i686/opt/filebot" dir="${dir.lib}/native/linux-i686" includes="*.so" />
 			<tarfileset prefix="amd64/opt/filebot" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
-			<tarfileset prefix="i386/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" />
+			<tarfileset prefix="i686/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" />
 			<tarfileset prefix="amd64/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" />
 			<tarfileset fullpath="filebot.desktop" file="${dir.installer}/ubuntu/FileBot.desktop" />
 			<tarfileset fullpath="filebot.svg" file="${dir.installer}/icons/icon.svg" />
@@ -322,10 +322,10 @@
 	</target>
 
 
-	<target name="deb" description="Build debian package for i386 and amd64">
+	<target name="deb" description="Build debian package for i686 and amd64">
 		<taskdef resource="ant_deb_task.properties" classpath="${dir.lib}/build/ant-deb.jar" />
 		<antcall target="deb-arch">
-			<param name="arch" value="i386" />
+			<param name="arch" value="i686" />
 		</antcall>
 		<antcall target="deb-arch">
 			<param name="arch" value="amd64" />
@@ -478,7 +478,7 @@
 			<param name="arch" value="win32-x64" />
 		</antcall>
 		<antcall target="webstart-nativelib">
-			<param name="arch" value="linux-i386" />
+			<param name="arch" value="linux-i686" />
 		</antcall>
 		<antcall target="webstart-nativelib">
 			<param name="arch" value="linux-amd64" />
@@ -615,7 +615,7 @@
 		<!-- prepare release packages -->
 		<copy todir="${dir.dist}/release/${title}_${version}" file="${path.fatjar}" />
 		<copy todir="${dir.dist}/release/${title}_${version}" file="${path.appbundle.tar.gz}" />
-		<copy todir="${dir.dist}/release/${title}_${version}" file="${dir.dist}/filebot_${version}_i386.deb" />
+		<copy todir="${dir.dist}/release/${title}_${version}" file="${dir.dist}/filebot_${version}_i686.deb" />
 		<copy todir="${dir.dist}/release/${title}_${version}" file="${dir.dist}/filebot_${version}_amd64.deb" />
 		<copy todir="${dir.dist}/release/${title}_${version}" file="${dir.dist}/filebot_${version}_arm.ipk" />
 		<copy todir="${dir.dist}/release/${title}_${version}" file="${dir.dist}/filebot_${version}_i686.ipk" />
diff --git a/installer/webstart/filebot.jnlp b/installer/webstart/filebot.jnlp
index 7fb23bb1..f9e742bf 100644
--- a/installer/webstart/filebot.jnlp
+++ b/installer/webstart/filebot.jnlp
@@ -71,8 +71,8 @@
 	<resources os="Windows" arch="amd64">
 		<nativelib href="native/win32-x64.jar"   download="lazy" part="native" />
 	</resources>
-	<resources os="Linux" arch="i386">
-		<nativelib href="native/linux-i386.jar"  download="lazy" part="native" />
+	<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" />
diff --git a/website/index.html b/website/index.html
index 7b9d4a31..ab4664a9 100644
--- a/website/index.html
+++ b/website/index.html
@@ -326,7 +326,7 @@
 						-->
 						<li>Windows installer: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot_setup.exe'])" target="_blank" href="download.php?mode=s&amp;type=nsis">FileBot_@{version}-setup.exe</a></li>
 						<li>Mac OS X app bundle: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.app'])" target="_blank" href="download.php?mode=s&amp;type=app">FileBot_@{version}.app</a></li>
-						<li>Debian packages: <a onclick="_gaq.push(['_trackPageview', '/download/filebot_i386.deb'])" target="_blank" href="download.php?mode=s&amp;type=deb&amp;arch=i386">filebot_@{version}_i386.deb</a> or <a onclick="_gaq.push(['_trackPageview', '/download/filebot_amd64.deb'])" target="_blank" href="download.php?mode=s&amp;type=deb&amp;arch=amd64">filebot_@{version}_amd64.deb</a></li>
+						<li>Debian packages: <a onclick="_gaq.push(['_trackPageview', '/download/filebot_i686.deb'])" target="_blank" href="download.php?mode=s&amp;type=deb&amp;arch=i686">filebot_@{version}_i686.deb</a> or <a onclick="_gaq.push(['_trackPageview', '/download/filebot_amd64.deb'])" target="_blank" href="download.php?mode=s&amp;type=deb&amp;arch=amd64">filebot_@{version}_amd64.deb</a></li>
 						<li>Embedded Linux packages: <a onclick="_gaq.push(['_trackPageview', '/download/filebot_arm.ipk'])" target="_blank" href="download.php?mode=s&amp;type=ipkg&amp;arch=arm">filebot_@{version}_arm.ipk</a> or <a onclick="_gaq.push(['_trackPageview', '/download/filebot_i686.ipk'])" target="_blank" href="download.php?mode=s&amp;type=ipkg&amp;arch=i686">filebot_@{version}_i686.ipk</a></li>
 						<li>Portable: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot-portable.zip'])" target="_blank" href="download.php?mode=s&amp;type=portable">FileBot-@{version}-portable.zip</a><small class="comment">for Windows, Linux, Mac OS X, BSD and Solaris</small>
 							<ul>