diff --git a/build.xml b/build.xml
index 8c780790..3587133a 100644
--- a/build.xml
+++ b/build.xml
@@ -860,6 +860,29 @@
 	</target>
 
 
+	<target name="deploy-chocolatey" description="Update Chocolatey Package Source">
+		<checksum property="x64.msi.sha256" file="${dir.release}/${release}_x64.msi" algorithm="SHA-256" />
+
+		<!-- replace variables for new release -->
+		<copy-replace todir="${dir.dist}/chocolatey">
+			<fileset dir="${dir.installer}/chocolatey">
+				<include name="**/*.ps1" />
+				<include name="**/*.nuspec" />
+			</fileset>
+		</copy-replace>
+
+		<!-- chocolatey pack and push -->
+		<exec executable="chocolatey" dir="${dir.dist}/chocolatey" failonerror="yes">
+			<arg line="pack" />
+		</exec>
+		<exec executable="chocolatey" dir="${dir.dist}/chocolatey" failonerror="yes">
+			<arg line="push ${package.name}.${version}.nupkg" />
+		</exec>
+	</target>
+
+
+
+
 	<target name="deploy-website" depends="revision" description="Upload website resources">
 		<!-- copy image resources -->
 		<copy todir="${dir.dist}/website/resources" preservelastmodified="yes" verbose="yes" flatten="true">
diff --git a/installer/chocolatey/filebot.nuspec b/installer/chocolatey/filebot.nuspec
new file mode 100644
index 00000000..abd20668
--- /dev/null
+++ b/installer/chocolatey/filebot.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+	<metadata>
+		<id>@{package.name}</id>
+		<title>@{application.name}</title>
+		<version>@{application.version}</version>
+		<authors>@{package.developer}</authors>
+		<owners>@{package.maintainer}</owners>
+		<summary>@{package.synopsis}</summary>
+		<description>@{package.description}</description>
+		<tags>@{package.tags}</tags>
+		<iconUrl>@{link.image.logo}</iconUrl>
+		<projectUrl>@{package.homepage}</projectUrl>
+		<docsUrl>@{link.intro}</docsUrl>
+		<mailingListUrl>@{link.forums}</mailingListUrl>
+		<bugTrackerUrl>@{link.bugs}</bugTrackerUrl>
+		<copyright>@{tstamp.year} @{package.developer}</copyright>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+	</metadata>
+	<files>
+		<file src="tools\**" target="tools" />
+	</files>
+</package>
diff --git a/installer/chocolatey/tools/chocolateyInstall.ps1 b/installer/chocolatey/tools/chocolateyInstall.ps1
new file mode 100644
index 00000000..fd9bdb9f
--- /dev/null
+++ b/installer/chocolatey/tools/chocolateyInstall.ps1
@@ -0,0 +1 @@
+Install-ChocolateyPackage -PackageName '@{package.name}' -FileType 'msi' -SilentArgs '/quiet' -Url64bit 'https://get.filebot.net/@{package.name}/@{release}/@{release}_x64.msi' -ChecksumType64 'sha256' -Checksum64 '@{x64.msi.sha256}'
diff --git a/installer/chocolatey/tools/chocolateyUninstall.ps1 b/installer/chocolatey/tools/chocolateyUninstall.ps1
new file mode 100644
index 00000000..2cf4e3c4
--- /dev/null
+++ b/installer/chocolatey/tools/chocolateyUninstall.ps1
@@ -0,0 +1,8 @@
+$app = Get-WmiObject -Query "SELECT * FROM Win32_Product WHERE Name = '@{application.name}'"
+
+if ($app -eq $null) {
+	echo '@{application.name} is not installed.'
+} else {
+	$app.Uninstall()
+	echo '@{application.name} has been uninstalled.'
+}