diff --git a/ChocolateyPackages/.gitignore b/ChocolateyPackages/.gitignore
new file mode 100644
index 00000000..a7aeaaa1
--- /dev/null
+++ b/ChocolateyPackages/.gitignore
@@ -0,0 +1 @@
+*.nupkg
diff --git a/ChocolateyPackages/switcheroo.install/switcheroo.install.nuspec b/ChocolateyPackages/switcheroo.install/switcheroo.install.nuspec
new file mode 100644
index 00000000..e63085cd
--- /dev/null
+++ b/ChocolateyPackages/switcheroo.install/switcheroo.install.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>switcheroo.install</id>
+    <title>Switcheroo (Install)</title>
+    <version>0.8.1.52</version>
+    <authors>Regin Larsen, James Sulak</authors>
+    <owners>Regin Larsen</owners>
+    <summary>An alternative alt-tab task switcher</summary>
+    <description>Switcheroo is for anyone who spends more time using a keyboard than a mouse. Instead of alt-tabbing through a (long) list of open windows, Switcheroo allows you to quickly switch to any window by typing in just a few characters of its title. It's inspired by Emacs's IDO mode buffer switching and JetBrains' ReSharper.</description>
+    <projectUrl>http://www.switcheroo.io</projectUrl>
+    <tags>switcheroo</tags>
+    <copyright>GNU GPL 3</copyright>
+    <licenseUrl>http://www.switcheroo.io/</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <iconUrl>https://cdn.rawgit.com/kvakulo/Switcheroo/8ff2eaaee6092b05e00b21f78745c1d2d834e0ae/logo.png</iconUrl>
+    <releaseNotes></releaseNotes>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>
diff --git a/ChocolateyPackages/switcheroo.install/tools/chocolateyInstall.ps1 b/ChocolateyPackages/switcheroo.install/tools/chocolateyInstall.ps1
new file mode 100644
index 00000000..86e8fecf
--- /dev/null
+++ b/ChocolateyPackages/switcheroo.install/tools/chocolateyInstall.ps1
@@ -0,0 +1,7 @@
+$packageName = 'switcheroo.install'
+$installerType = 'EXE'
+$url = 'https://github.com/kvakulo/Switcheroo/releases/download/v0.8.1/switcheroo-setup.exe'
+$silentArgs = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART'
+$validExitCodes = @(0)
+
+Install-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" "$url64"  -validExitCodes $validExitCodes
\ No newline at end of file
diff --git a/ChocolateyPackages/switcheroo.portable/switcheroo.portable.nuspec b/ChocolateyPackages/switcheroo.portable/switcheroo.portable.nuspec
new file mode 100644
index 00000000..c9b69042
--- /dev/null
+++ b/ChocolateyPackages/switcheroo.portable/switcheroo.portable.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>switcheroo.portable</id>
+    <title>Switcheroo (Portable)</title>
+    <version>0.8.1.52</version>
+    <authors>Regin Larsen, James Sulak</authors>
+    <owners>Regin Larsen</owners>
+    <summary>An alternative alt-tab task switcher</summary>
+    <description>Switcheroo is for anyone who spends more time using a keyboard than a mouse. Instead of alt-tabbing through a (long) list of open windows, Switcheroo allows you to quickly switch to any window by typing in just a few characters of its title. It's inspired by Emacs's IDO mode buffer switching and JetBrains' ReSharper.</description>
+    <projectUrl>http://www.switcheroo.io</projectUrl>
+    <tags>switcheroo</tags>
+    <copyright>GNU GPL 3</copyright>
+    <licenseUrl>http://www.switcheroo.io/</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <iconUrl>https://cdn.rawgit.com/kvakulo/Switcheroo/8ff2eaaee6092b05e00b21f78745c1d2d834e0ae/logo.png</iconUrl>
+    <releaseNotes></releaseNotes>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>
diff --git a/ChocolateyPackages/switcheroo.portable/tools/chocolateyInstall.ps1 b/ChocolateyPackages/switcheroo.portable/tools/chocolateyInstall.ps1
new file mode 100644
index 00000000..3e90766c
--- /dev/null
+++ b/ChocolateyPackages/switcheroo.portable/tools/chocolateyInstall.ps1
@@ -0,0 +1,4 @@
+$packageName = 'switcheroo.portable'
+$url = 'https://github.com/kvakulo/Switcheroo/releases/download/v0.8.1/switcheroo-portable.zip'
+
+Install-ChocolateyZipPackage "switcheroo" "$url"  "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
\ No newline at end of file
diff --git a/ChocolateyPackages/switcheroo.portable/tools/switcheroo.exe.gui b/ChocolateyPackages/switcheroo.portable/tools/switcheroo.exe.gui
new file mode 100644
index 00000000..e69de29b
diff --git a/ChocolateyPackages/switcheroo/switcheroo.nuspec b/ChocolateyPackages/switcheroo/switcheroo.nuspec
new file mode 100644
index 00000000..2a6d56f4
--- /dev/null
+++ b/ChocolateyPackages/switcheroo/switcheroo.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>switcheroo</id>
+    <title>Switcheroo</title>
+    <version>0.8.1.52</version>
+    <authors>Regin Larsen, James Sulak</authors>
+    <owners>Regin Larsen</owners>
+    <summary>An alternative alt-tab task switcher</summary>
+    <description>Switcheroo is for anyone who spends more time using a keyboard than a mouse. Instead of alt-tabbing through a (long) list of open windows, Switcheroo allows you to quickly switch to any window by typing in just a few characters of its title. It's inspired by Emacs's IDO mode buffer switching and JetBrains' ReSharper.</description>
+    <projectUrl>http://www.switcheroo.io</projectUrl>
+    <tags>switcheroo</tags>
+    <copyright>GNU GPL 3</copyright>
+    <licenseUrl>http://www.switcheroo.io/</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <iconUrl>https://cdn.rawgit.com/kvakulo/Switcheroo/8ff2eaaee6092b05e00b21f78745c1d2d834e0ae/logo.png</iconUrl>
+    <dependencies>
+      <dependency id="switcheroo.install" version="0.8.1.52" />
+    </dependencies>
+    <releaseNotes></releaseNotes>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>
diff --git a/ChocolateyPackages/switcheroo/tools/chocolateyInstall.ps1 b/ChocolateyPackages/switcheroo/tools/chocolateyInstall.ps1
new file mode 100644
index 00000000..dd1a1e28
--- /dev/null
+++ b/ChocolateyPackages/switcheroo/tools/chocolateyInstall.ps1
@@ -0,0 +1 @@
+#Install-VirtualPackage 'switcheroo.portable' 'switcheroo.install'
\ No newline at end of file