diff --git a/icons/cantata.png b/icons/cantata.png
new file mode 100755
index 0000000..c12d645
Binary files /dev/null and b/icons/cantata.png differ
diff --git a/packages/cantata/cantata.nuspec b/packages/cantata/cantata.nuspec
new file mode 100755
index 0000000..de0c132
--- /dev/null
+++ b/packages/cantata/cantata.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>Cantata</id>
+        <version>2.2.0</version>
+        <title>Cantata</title>
+        <authors>Craig Drummond</authors>
+        <owners>foo.li systeme + software</owners>
+        <licenseUrl>https://github.com/CDrummond/cantata/blob/master/LICENSE</licenseUrl>
+		<projectUrl>https://github.com/CDrummond/cantata</projectUrl>
+        <iconUrl>https://raw.githubusercontent.com/peterbeck/chocolatey/master/icons/cantata.png</iconUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+		<description>Cantata is a Qt5 Graphical MPD Client for Linux, Windows, macOS, Haiku</description>
+        <summary>A graphical (Qt5) client for MPD</summary>
+        <releaseNotes>https://github.com/CDrummond/cantata/releases/tag/v2.2.0</releaseNotes>
+        <copyright>2017 Kopano</copyright>
+        <language />
+        <tags>cantata music audio mp3 floss cross-platform ogg player admin</tags>
+    </metadata>
+</package>
diff --git a/packages/cantata/tools/chocolateyinstall.ps1 b/packages/cantata/tools/chocolateyinstall.ps1
new file mode 100755
index 0000000..0b93f51
--- /dev/null
+++ b/packages/cantata/tools/chocolateyinstall.ps1
@@ -0,0 +1,19 @@
+# Cantata
+# 2018 foo.li systeme + software
+# https://www.gnu.org/licenses/gpl.txt
+
+$packageName    = 'cantata'
+$packageSearch  = 'Cantata'
+$installerType  = 'exe'
+$silentArgs     = '/S'
+$version        = '2.2.0'
+$url            = 'https://github.com/CDrummond/cantata/releases/download/v' + $version + '/Cantata-' + $version + '-Setup.exe'
+$url64          = $url
+$checksum       = 'C639415127FE649FBB86062EAFCA4889F9EE34E5'
+$checksumType   = 'sha1'
+$checksum64     = $checksum
+$checksumType64 = $checksumType
+
+Install-ChocolateyPackage $packageName $installerType $silentArgs $url $url64 `
+	-checksum $checksum -checksumType $checksumType `
+	-checksum64 $checksum64 -checksumType64 $checksumType64
\ No newline at end of file
diff --git a/packages/cantata/tools/chocolateyuninstall.ps1 b/packages/cantata/tools/chocolateyuninstall.ps1
new file mode 100755
index 0000000..0eb7b5e
--- /dev/null
+++ b/packages/cantata/tools/chocolateyuninstall.ps1
@@ -0,0 +1,13 @@
+# Cantata uninstaller
+# chocolatey auto uninstaller does not uninstall...
+
+$packageName	= 'cantata'
+$silentArgs 	= '/S'
+
+if (Test-Path "$env:ProgramFiles\Cantata\uninstall.exe") {
+    & "$env:ProgramFiles\Cantata\uninstall.exe" $silentArgs
+} elseif (Test-Path "${env:ProgramFiles(x86)}\Cantata\uninstall.exe") {
+    & "${env:ProgramFiles(x86)}\Cantata\uninstall.exe" $silentArgs
+} else {
+	Write-Host 'Cantata is already uninstalled.'
+}
\ No newline at end of file