diff --git a/build.xml b/build.xml
index 917ee974..2fdbe213 100644
--- a/build.xml
+++ b/build.xml
@@ -465,33 +465,19 @@
 	</target>
 
 
-	<target name="ipkg" description="Build ipkg package for ARM and ATOM">
+	<target name="ipkg" description="Build ipkg package">
 		<taskdef resource="ant_deb_task.properties" classpath="${dir.lib}/build/ant-deb.jar" />
 
-		<antcall target="ipkg-arch">
-			<param name="arch" value="arm" />
-			<param name="deb.arch" value="arm" />
-		</antcall>
-		<antcall target="ipkg-arch">
-			<param name="arch" value="i686" />
-			<param name="deb.arch" value="i686" />
-		</antcall>
-	</target>
-
-
-	<target name="ipkg-arch">
 		<!-- 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="${deb.arch}" section="misc" homepage="http://www.filebot.net" priority="optional" postinst="${dir.installer}/ipkg/postinst.sh" prerm="${dir.installer}/ipkg/prerm.sh">
+		<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="rednoah@users.sourceforge.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" dir="${dir.lib}/native/linux-${arch}" includes="*.so" />
-			<tarfileset prefix="opt/share/filebot" file="${dir.lib}/native/linux-${arch}/fpcalc" filemode="755" />
 			<tarfileset prefix="opt/share/filebot/bin" file="${dir.installer}/ipkg/filebot.sh" filemode="755" />
 		</deb>
-		<move tofile="${dir.dist}/filebot_${version}_${deb.arch}.ipk" file="${staging.file.deb}" overwrite="no" failonerror="yes" />
+		<move tofile="${dir.dist}/filebot_${version}_noarch.ipk" file="${staging.file.deb}" overwrite="no" failonerror="yes" />
 		<delete dir="${ipkg.staging}" />
 	</target>
 
@@ -507,6 +493,7 @@
 		</antcall>
 	</target>
 
+
 	<target name="msi-arch">
 		<property name="jnidispatch" location="${dir.lib}/native/win32-${arch}/jnidispatch.dll" />
 		<property name="mediainfo" location="${dir.lib}/native/win32-${arch}/MediaInfo.dll" />
diff --git a/website/index.html b/website/index.html
index 71509c12..fdc17f29 100644
--- a/website/index.html
+++ b/website/index.html
@@ -277,15 +277,15 @@
 						<li class="ubuntu">Available on the <a target="_blank" href="https://apps.ubuntu.com/cat/applications/filebot/">Ubuntu Software Center</a></li>
 						<li>Windows installer: <a target="_blank" href="download.php?mode=s&amp;type=nsis">FileBot_@{version}-setup.exe</a></li>
 						<li>Debian packages: <a target="_blank" href="download.php?mode=s&amp;type=deb&amp;arch=i386">filebot_@{version}_i386.deb</a> or <a target="_blank" href="download.php?mode=s&amp;type=deb&amp;arch=amd64">filebot_@{version}_amd64.deb</a></li>
-						<li>Embedded Linux packages: <a target="_blank" href="download.php?mode=s&amp;type=ipkg&amp;arch=arm">filebot_@{version}_arm.ipk</a> or <a target="_blank" href="download.php?mode=s&amp;type=ipkg&amp;arch=i686">filebot_@{version}_i686.ipk</a></li>
+						<li>Embedded Linux package: <a target="_blank" href="download.php?mode=s&amp;type=ipkg&amp;arch=noarch">filebot_@{version}_noarch.ipk</a></li>
 						<li>Portable: <a target="_blank" href="download.php?mode=s&amp;type=portable">FileBot-@{version}-portable.zip</a> <small class="comment">for all platforms</small>
 							<ul>
 								<li>This package does not include the <a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/lib/native/" target="_blank">MediaInfo and 7-Zip native libraries</a></li>
 							</ul>
 						</li>
 						<li>Windows package is available <a target="_blank" href="http://chocolatey.org/packages/filebot/">via Chocolatey</a></li>
-                        <li>OS X package is available <a target="_blank" href="http://caskroom.io/">via Homebrew Cask</a> <small class="comment">for the command-line tools</small></li>
-                        <li>Synology NAS package is available <a target="_blank" href="https://www.filebot.net/forums/viewtopic.php?f=3&amp;t=1802">via Package Center</a></li>
+						<li>OS X package is available <a target="_blank" href="http://caskroom.io/">via Homebrew Cask</a> <small class="comment">for the command-line tools</small></li>
+						<li>Synology NAS package is available <a target="_blank" href="https://www.filebot.net/forums/viewtopic.php?f=3&amp;t=1802">via Package Center</a></li>
 						<li>All files and other versions are available on <a target="_blank" href="https://sourceforge.net/projects/filebot/files/filebot/">SourceForge.net</a></li>
 					</ul>
 				</div>