diff --git a/build.xml b/build.xml
index 42049d6c..821e7470 100644
--- a/build.xml
+++ b/build.xml
@@ -435,6 +435,7 @@
 		<copy todir="${dir.dist}/website">
 			<fileset dir="${dir.website}">
 				<include name="*.xml" />
+				<include name="*.php" />
 				<include name="*.html" />
 				<include name="*.css" />
 				<include name="*.js" />
@@ -449,6 +450,7 @@
 		<!-- replace variables for new release -->
 		<replace dir="${dir.dist}/website" encoding="utf-8" summary="yes">
 			<include name="**/*.html" />
+			<include name="**/*.php" />
 			<replacefilter token="@{version}" value="${version}" />
 		</replace>
 
diff --git a/website/download.php b/website/download.php
new file mode 100644
index 00000000..96c196eb
--- /dev/null
+++ b/website/download.php
@@ -0,0 +1,21 @@
+<?php
+$version = isset($_GET['version']) ? $_GET['version'] : '@{version}';
+$arch = $_GET['arch'];
+$type = $_GET['type'];
+
+$folder = 'http://sourceforge.net/projects/filebot/files/filebot/FileBot_'.$version;
+$file = 'undefined';
+if ($type == 'msi')
+	$file = 'FileBot_'.$version.'_'.$arch.'.msi';
+if ($type == 'deb')
+	$file =  'filebot_'.$version.'_'.$arch.'.deb';
+if ($type == 'app')
+	$file = 'FileBot_'.$version.'.app.tar.gz';
+if ($type == 'jar')
+	$file = 'FileBot_'.$version.'.jar';
+if ($type == 'src')
+	$file = 'filebot-'.$version.'-src.zip';
+
+header('HTTP/1.1 302 Found');
+header('Location: '.$folder.'/'.$file.'/download');
+?>
diff --git a/website/index.html b/website/index.html
index 43c0b606..858e8fae 100644
--- a/website/index.html
+++ b/website/index.html
@@ -122,7 +122,7 @@
 									<img width="150" height="118" src="screenshots/small/panel.rename.png" alt="Rename files" />
 								</a>
 							</div>
-							Rename and move hundreds of media files in a matter of seconds<br/><span class="note java">physically moving files requires Java 7</span>
+							Rename and move hundreds of media files in a matter of seconds
 						</li>
 						<li>Fetch episode info from <a href="http://www.tvrage.com">TVRage</a>, <a href="http://anidb.net">AniDB</a>, <a href="http://www.imdb.com">IMDb</a>, <a href="http://thetvdb.com">TheTVDB</a> or <a href="http://www.serienjunkies.de">Serienjunkies</a></li>
 						<li>Accurate and robust and simply awesome file / episode matching logic</li>
@@ -167,15 +167,15 @@
 					<span class="quote">Today is the day</span>
 					<h2>Download</h2>
 					<ul>
-						<li>Executable Jar: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.jar'])" target="_blank" href="http://sourceforge.net/projects/filebot/files/filebot/FileBot_@{version}/FileBot_@{version}.jar/download">FileBot_@{version}.jar</a> (<strong>12.5MB</strong>) <small class="comment">for Windows, Linux, Mac OS X, BSD and Solaris</small>
+						<li>Executable Jar: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.jar'])" target="_blank" href="download.php?type=jar">FileBot_@{version}.jar</a> (<strong>12.5MB</strong>) <small class="comment">for Windows, Linux, Mac OS X, BSD and Solaris</small>
 							<ul>
 								<li>This package does not include the <a href="http://mediainfo.sourceforge.net/en/Download" target="_blank">MediaInfo native libraries</a>. <small class="comment">32-bit JRE requires 32-bit native libs</small></li>
 							</ul>
 						</li>
-						<li>Mac OS X app bundle: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.app'])" target="_blank" href="http://sourceforge.net/projects/filebot/files/filebot/FileBot_@{version}/FileBot_@{version}.app.tar.gz/download">FileBot_@{version}.app</a> (<strong>15MB</strong>)</li>
-						<li>Windows installer: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot_x86.msi'])" target="_blank" href="http://sourceforge.net/projects/filebot/files/filebot/FileBot_@{version}/FileBot_@{version}_x86.msi/download">FileBot_@{version}_x86.msi</a> or <a onclick="_gaq.push(['_trackPageview', '/download/FileBot_x64.msi'])" target="_blank" href="http://sourceforge.net/projects/filebot/files/filebot/FileBot_@{version}/FileBot_@{version}_x64.msi/download">FileBot_@{version}_x64.msi</a> (<strong>13.2MB</strong>)</li>
-						<li>Debian packages: <a onclick="_gaq.push(['_trackPageview', '/download/filebot_i386.deb'])" target="_blank" href="http://sourceforge.net/projects/filebot/files/filebot/FileBot_@{version}/filebot_@{version}_i386.deb/download">filebot_@{version}_i386.deb</a> or <a onclick="_gaq.push(['_trackPageview', '/download/filebot_amd64.deb'])" target="_blank" href="http://sourceforge.net/projects/filebot/files/filebot/FileBot_@{version}/filebot_@{version}_amd64.deb/download">filebot_@{version}_amd64.deb</a> (<strong>13.2MB</strong>)</li>
-						<li>Source Zip: <a onclick="_gaq.push(['_trackPageview', '/download/filebot-src.zip'])" target="_blank" href="http://sourceforge.net/projects/filebot/files/filebot/FileBot_@{version}/filebot-@{version}-src.zip/download">filebot-@{version}-src.zip</a> (<strong>450kB</strong>)</li>
+						<li>Mac OS X app bundle: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.app'])" target="_blank" href="download.php?type=app">FileBot_@{version}.app</a> (<strong>15MB</strong>)</li>
+						<li>Windows installer: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot_x86.msi'])" target="_blank" href="download.php?type=msi&amp;arch=x86">FileBot_@{version}_x86.msi</a> or <a onclick="_gaq.push(['_trackPageview', '/download/FileBot_x64.msi'])" target="_blank" href="download.php?type=msi&amp;arch=x64">FileBot_@{version}_x64.msi</a> (<strong>13.2MB</strong>)</li>
+						<li>Debian packages: <a onclick="_gaq.push(['_trackPageview', '/download/filebot_i386.deb'])" target="_blank" href="download.php?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?type=deb&amp;arch=amd64">filebot_@{version}_amd64.deb</a> (<strong>13.2MB</strong>)</li>
+						<li>Source Zip: <a onclick="_gaq.push(['_trackPageview', '/download/filebot-src.zip'])" target="_blank" href="download.php?type=src">filebot-@{version}-src.zip</a> (<strong>450kB</strong>)</li>
 					</ul>
 				</div>