diff --git a/SemanticMerge/SemanticMerge.nuspec b/SemanticMerge/SemanticMerge.nuspec
new file mode 100644
index 0000000..314bee3
--- /dev/null
+++ b/SemanticMerge/SemanticMerge.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata>
+    <id>SemanticMerge</id>
+    <title>Semantic Merge</title>
+    <version>0.9.17.0</version>
+    <authors>Plasic SCM</authors>
+    <owners>Ethan Brown</owners>
+    <summary>Semantic Merge - The ultimate merging machine.  A semantic merge tool... that understands your code.</summary>
+    <description>The download url is an unversioned permalink, and hence will always be the latest version, even if the version
+of this package is not updated.
+
+Please see the documentation at http://www.semanticmerge.com/documents/semanticmerge-intro-guide.pdf
+    </description>
+    <projectUrl>http://www.semanticmerge.com/</projectUrl>
+    <tags>sourcecode merge tool dvcs git</tags>
+    <licenseUrl>http://www.plasticscm.com/buy.aspx</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <iconUrl>https://github.com/Iristyle/ChocolateyPackages/raw/master/SemanticMerge/logo-semantic-merge.png</iconUrl>
+    <releaseNotes></releaseNotes>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>
diff --git a/SemanticMerge/logo-semantic-merge.png b/SemanticMerge/logo-semantic-merge.png
new file mode 100644
index 0000000..7ec6b0e
Binary files /dev/null and b/SemanticMerge/logo-semantic-merge.png differ
diff --git a/SemanticMerge/tools/chocolateyInstall.ps1 b/SemanticMerge/tools/chocolateyInstall.ps1
new file mode 100644
index 0000000..58bfb7b
--- /dev/null
+++ b/SemanticMerge/tools/chocolateyInstall.ps1
@@ -0,0 +1,23 @@
+$package = 'SemanticMerge'
+
+try {
+  $params = @{
+    packageName = $package;
+    fileType = 'exe';
+    # BitRock Install Builder
+    # http://installbuilder.bitrock.com/docs/installbuilder-userguide/ar01s10.html
+    silentArgs = '--unattendedmodeui none', '--mode unattended';
+    url = 'http://www.semanticmerge.com/users/download'
+  }
+
+  Install-ChocolateyPackage @params
+
+  Write-Host @'
+For instructions for use with configuration as a Git merge tool, please see:
+
+http://rlbisbe.wordpress.com/2013/04/15/semantic-merge-as-the-default-merge-tool-with-git-on-windows/
+'@
+} catch {
+  Write-ChocolateyFailure $package "$($_.Exception.Message)"
+  throw
+}