diff --git a/build.xml b/build.xml
index 4d85f52c..f597cb24 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <project name="filebot" default="fatjar">
+	<!-- include default inputs (optional) -->
+	<property file="profile.properties" />
 
 	<!-- include application properties -->
 	<property file="source/net/sourceforge/filebot/Settings.properties" />
@@ -29,7 +31,7 @@
 
 	<property name="deploy.data" value="web.sourceforge.net:htdocs/data" />
 	<property name="deploy.data.frs" value="web.sourceforge.net:/home/frs/project/f/fi/filebot/data" />
-	
+
 
 	<target name="jar" depends="build">
 		<!-- create dist dir -->
@@ -245,7 +247,7 @@
 	<target name="deb-arch">
 		<deb todir="${dir.dist}" package="filebot" version="${version}" architecture="${arch}" section="misc" depends="default-jre-headless" recommends="default-jre" suggests="openjdk-7-jre" homepage="http://filebot.sourceforge.net" priority="optional" postinst="${dir.installer}/deb/postinst.sh" prerm="${dir.installer}/deb/prerem.sh">
 			<maintainer name="Reinhard Pointner" email="rednoah@users.sourceforge.net" />
-			<description synopsis="The ultimate tv renamer / subtitle downloader / sfv validator">FileBot is the ultimate tool for renaming your tv shows and anime, downloading subtitles from various sources or just simple file verification.</description>
+			<description synopsis="The ultimate tv renamer / subtitle downloader / sfv validator">FileBot is the ultimate tool for renaming your movies, tv shows or anime and downloading subtitles. It's smart, streamlined for simplicity and just works. Plus there's a full-featured command-line interface for all sorts of automation.</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.installer}/icons/icon.svg" />
@@ -579,6 +581,29 @@
 	</target>
 
 
+	<target name="chocolatey-push" description="chocolatey package">
+		<copy todir="${dir.dist}/chocolatey">
+			<fileset dir="${dir.installer}/chocolatey" />
+		</copy>
+
+		<!-- replace variables for new release -->
+		<replace dir="${dir.dist}/chocolatey" encoding="utf-8" summary="yes">
+			<include name="**/*.ps1" />
+			<include name="**/*.nuspec" />
+			<replacefilter token="@{version}" value="${version}" />
+		</replace>
+
+		<!-- chocolatey pack -->
+		<exec executable="chocolatey.bat" dir="${dir.dist}/chocolatey" failonerror="true">
+			<arg line="pack" />
+		</exec>
+
+		<exec executable="chocolatey.bat" dir="${dir.dist}/chocolatey" failonerror="true">
+			<arg line="push ${dir.dist}/chocolatey/filebot.${version}.nupkg" />
+		</exec>
+	</target>
+
+
 	<target name="upload-data" depends="login">
 		<scp todir="${sf.user}:${sf.password}@${deploy.data}" trust="yes" verbose="true" sftp="true">
 			<fileset dir="${dir.website}/data">
@@ -616,8 +641,8 @@
 
 	<target name="login">
 		<!-- ask for sourceforge password -->
-		<property name="sf.user" value="rednoah,filebot" />
-		<input message="Please enter password:" addproperty="sf.password" />
+		<input message="Please enter sourceforge username:" addproperty="sf.user" />
+		<input message="Please enter sourceforge password:" addproperty="sf.password" />
 	</target>
 
 </project>
diff --git a/installer/chocolatey/filebot.nuspec b/installer/chocolatey/filebot.nuspec
new file mode 100644
index 00000000..7ef3c9b1
--- /dev/null
+++ b/installer/chocolatey/filebot.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+	<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+	<metadata>
+		<id>filebot</id>
+		<title>FileBot</title>
+		<version>@{version}</version>
+		<authors>Reinhard Pointner</authors>
+		<owners>rednoah</owners>
+		<summary>The ultimate tv renamer / subtitle downloader / sfv validator</summary>
+		<description>FileBot is the ultimate tool for renaming your movies, tv shows or anime and downloading subtitles. It's smart, streamlined for simplicity and just works. Plus there's a full-featured command-line interface for all sorts of automation.</description>
+		<projectUrl>http://filebot.sourceforge.net/</projectUrl>
+		<tags>rename, subtitles, sfv</tags>
+		<copyright></copyright>
+		<licenseUrl>http://www.gnu.org/licenses/gpl-2.0.html</licenseUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<iconUrl>http://filebot.sourceforge.net/images/filebot.logo.png</iconUrl>
+		<dependencies>
+			<dependency id="javaruntime" version="" />
+		</dependencies>
+		<releaseNotes></releaseNotes>
+	</metadata>
+	<files>
+		<file src="tools\**" target="tools" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/installer/chocolatey/tools/chocolateyInstall.ps1 b/installer/chocolatey/tools/chocolateyInstall.ps1
new file mode 100644
index 00000000..41bbd4ca
--- /dev/null
+++ b/installer/chocolatey/tools/chocolateyInstall.ps1
@@ -0,0 +1 @@
+Install-ChocolateyPackage 'filebot' 'msi' '/quiet' 'http://sourceforge.net/projects/filebot/files/filebot/FileBot_@{version}/FileBot_@{version}_x86.msi' 'http://sourceforge.net/projects/filebot/files/filebot/FileBot_@{version}/FileBot_@{version}_x64.msi'
\ No newline at end of file
diff --git a/website/index.html b/website/index.html
index 39f1dd3d..7bb27bf2 100644
--- a/website/index.html
+++ b/website/index.html
@@ -6,10 +6,10 @@
 		<link rel="alternate" type="application/rss+xml" title="RSS" href="http://twitter.com/statuses/user_timeline/filebot_renamer.rss" />
 		
 		<title>FileBot - The ultimate tv renamer / subtitle downloader / sfv validator</title>
-		<meta name="description" content="FileBot is the ultimate tool for renaming your tv shows or anime and downloading subtitles. It's smart, streamlined for simplicity and &quot;just works&quot;. FileBot supports Windows, Linux and Mac, plus there's a full-featured command-line interface for all sorts of automation." />
+		<meta name="description" content="FileBot is the ultimate tool for renaming your movies, tv shows or anime and downloading subtitles. It's smart, streamlined for simplicity and just works. FileBot supports Windows, Linux and Mac, plus there's a full-featured command-line interface for all sorts of automation." />
 		
 		<meta itemprop="name" content="FileBot - The ultimate tv renamer and subtitle downloader" />
-		<meta itemprop="description" content="FileBot is the ultimate tool for renaming your tv shows or anime and downloading subtitles. It's smart, streamlined for simplicity and &quot;just works&quot;. FileBot supports Windows, Linux and Mac, plus there's a full-featured command-line interface for all sorts of automation." />
+		<meta itemprop="description" content="FileBot is the ultimate tool for renaming your movies, tv shows or anime and downloading subtitles. It's smart, streamlined for simplicity and just works. FileBot supports Windows, Linux and Mac, plus there's a full-featured command-line interface for all sorts of automation." />
 		<meta itemprop="image" content="http://filebot.sourceforge.net/images/icon.png" />
 		
 		<link rel="stylesheet" href="base.css" type="text/css" />
@@ -258,6 +258,7 @@
 						<li>Embedded Linux packages: <a onclick="_gaq.push(['_trackPageview', '/download/filebot_arm.ipk'])" target="_blank" href="download.php?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?type=ipkg&amp;arch=i686">filebot_@{version}_i686.ipk</a> (<span class="filesize">20MB</span>)</li>
 						<li>Portable: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot-portable.zip'])" target="_blank" href="download.php?type=portable">FileBot-@{version}-portable.zip</a> (<span class="filesize">17MB</span>)</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> (<span class="filesize">600kB</span>)</li>
+						<li>Chocolatey Windows package is available <a target="_blank" href="http://chocolatey.org/packages/filebot/">via Chocolatey</a></li>
 						<li>Arch Linux package is available <a target="_blank" href="https://aur.archlinux.org/packages.php?ID=27459">via AUR</a></li>
 						<li>Synology NAS package is available <a target="_blank" href="http://missilehugger.com/735/synology-package-filebot/">from MissileHugger</a></li>
 					</ul>