diff --git a/icons/joplin.png b/icons/joplin.png
new file mode 100755
index 0000000..a5e8d97
Binary files /dev/null and b/icons/joplin.png differ
diff --git a/packages/joplin/joplin.nuspec b/packages/joplin/joplin.nuspec
new file mode 100755
index 0000000..3ce5cd2
--- /dev/null
+++ b/packages/joplin/joplin.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>joplin</id>
+        <version>0.10.60</version>
+        <title>Joplin</title>
+        <authors>Laurent Cozic</authors>
+        <owners>foo.li systeme + software</owners>
+        <licenseUrl>https://github.com/laurent22/joplin/blob/master/LICENSE</licenseUrl>
+        <projectUrl>http://joplin.cozic.net</projectUrl>
+        <iconUrl>https://raw.githubusercontent.com/peterbeck/chocolatey/master/icons/joplin.png</iconUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS. </description>
+        <summary>Joplin Notes and To-Do</summary>
+        <releaseNotes>https://github.com/laurent22/joplin/releases/tag/v0.10.60</releaseNotes>
+        <copyright>http://joplin.cozic.net</copyright>
+        <language />
+        <tags>notes todo admin</tags>
+    </metadata>
+</package>
diff --git a/packages/joplin/tools/chocolateyinstall.ps1 b/packages/joplin/tools/chocolateyinstall.ps1
new file mode 100755
index 0000000..ba419bc
--- /dev/null
+++ b/packages/joplin/tools/chocolateyinstall.ps1
@@ -0,0 +1,33 @@
+# Joplin Notes and To-Do
+# 2018 foo.li systeme + software
+
+$packageName    = 'joplin'
+$packageSearch  = 'Joplin*'
+$installerType  = 'exe'
+$silentArgs     = '/ALLUSERS=1 /S'
+$version        = '0.10.60'
+$url 			= 'https://github.com/laurent22/joplin/releases/download/v' + $version + '/Joplin-Setup-' + $version + '.exe'
+$url64          = $url
+$checksum       = 'A963E498EAEE0FF80E45D0BEA668E806F4177DEE'
+$checksumType   = 'sha1'
+$checksum64   	= $checksum
+$checksumType64 = $checksumType
+
+try {   
+    $app = Get-ItemProperty -Path @('HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*',
+                                    'HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*') `
+            -ErrorAction:SilentlyContinue | Where-Object { $_.DisplayName -like $packageSearch }
+	
+    if ($app -and ([version]$app.DisplayVersion -ge [version]$version)) {
+        Write-Output $(
+        'Joplin ' + $version + ' or greater is already installed. ' +
+        'No need to download and install again. Otherwise uninstall first.'
+        )
+    } else {
+        Install-ChocolateyPackage $packageName $installerType $silentArgs $url $url64 `
+                    -checksum $checksum -checksumType $checksumType `
+                    -checksum64 $checksum64 -checksumType64 $checksumType64
+    }           
+} catch {
+    throw $_.Exception
+}
\ No newline at end of file
diff --git a/packages/joplin/tools/chocolateyuninstall.ps1 b/packages/joplin/tools/chocolateyuninstall.ps1
new file mode 100755
index 0000000..4b364da
--- /dev/null
+++ b/packages/joplin/tools/chocolateyuninstall.ps1
@@ -0,0 +1,7 @@
+#Joplin uninstaller
+
+if (Test-Path "$env:ProgramFiles\Joplin\Uninstall Joplin.exe") {
+	& "$env:ProgramFiles\Joplin\Uninstall Joplin.exe" /S
+} else {
+	Write-Host 'could not detect Joplin'
+}
\ No newline at end of file