diff --git a/packages/bindiff.vm/bindiff.vm.nuspec b/packages/bindiff.vm/bindiff.vm.nuspec
new file mode 100644
index 000000000..b703912c6
--- /dev/null
+++ b/packages/bindiff.vm/bindiff.vm.nuspec
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
+  <metadata>
+    <id>bindiff.vm</id>
+    <version>8</version>
+    <authors>Zynamics</authors>
+    <description>A comparison tool for binary files that assists in quickly finding differences and similarities in disassembled code</description>
+    <dependencies>
+      <dependency id="common.vm" />
+    </dependencies>
+  </metadata>
+</package>
diff --git a/packages/bindiff.vm/tools/chocolateyinstall.ps1 b/packages/bindiff.vm/tools/chocolateyinstall.ps1
new file mode 100644
index 000000000..53d37b950
--- /dev/null
+++ b/packages/bindiff.vm/tools/chocolateyinstall.ps1
@@ -0,0 +1,10 @@
+$ErrorActionPreference = 'Stop'
+Import-Module vm.common -Force -DisableNameChecking
+
+$toolName = 'bindiff8'
+$category = 'File Information'
+
+$exeUrl = 'https://github.com/google/bindiff/releases/download/v8/bindiff8.msi'
+$exeSha256 = '688831e490bef8a20c9917048b693bad591f346b3b96489fc79ad8d20d7cb15f'
+
+VM-Install-Single-Exe $toolName $category $exeUrl -exeSha256 $exeSha256 -consoleApp $false
diff --git a/packages/bindiff.vm/tools/chocolateyuninstall.ps1 b/packages/bindiff.vm/tools/chocolateyuninstall.ps1
new file mode 100644
index 000000000..9710d0987
--- /dev/null
+++ b/packages/bindiff.vm/tools/chocolateyuninstall.ps1
@@ -0,0 +1,7 @@
+$ErrorActionPreference = 'Continue'
+Import-Module vm.common -Force -DisableNameChecking
+
+$toolName = 'bindiff8'
+$category = 'File Information'
+
+VM-Uninstall $toolName $category