diff --git a/HipChat/HipChat.nuspec b/HipChat/HipChat.nuspec
new file mode 100644
index 0000000..603f993
--- /dev/null
+++ b/HipChat/HipChat.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata>
+    <id>HipChat</id>
+    <title>HipChat Client</title>
+    <!-- really 1.20120926103402 -->
+    <version>1.2.103402</version>
+    <authors>Atlassian</authors>
+    <owners>Ethan J Brown</owners>
+    <summary>HipChat is instant messaging built for business.</summary>
+    <description>HipChat is a hosted private chat service for your company or team.
+Invite colleagues to share ideas and files in persistent group chat rooms.
+Get your team off AIM, Google Talk, and Skype — HipChat was built for business.
+
+    Note that HipChat auto-updates itself after an initial install.
+    </description>
+    <projectUrl>https://www.hipchat.com/</projectUrl>
+    <tags>chat team IM instant messaging collaboration cross-platform</tags>
+    <licenseUrl>https://www.hipchat.com/terms</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <iconUrl>https://github.com/Iristyle/ChocolateyPackages/raw/master/HipChat/HipChat.png</iconUrl>
+    <releaseNotes></releaseNotes>
+    <dependencies>
+      <dependency id="AdobeAIR" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>
diff --git a/HipChat/HipChat.png b/HipChat/HipChat.png
new file mode 100644
index 0000000..8aec8fd
Binary files /dev/null and b/HipChat/HipChat.png differ
diff --git a/HipChat/tools/chocolateyInstall.ps1 b/HipChat/tools/chocolateyInstall.ps1
new file mode 100644
index 0000000..41569de
--- /dev/null
+++ b/HipChat/tools/chocolateyInstall.ps1
@@ -0,0 +1,35 @@
+$package = 'HipChat'
+
+try {
+
+  $hipParams = @{
+    PackageName = $package;
+    FileFullPath = (Join-Path $Env:TEMP 'hipchat.air');
+    Url = 'http://downloads.hipchat.com/hipchat.air'
+  }
+
+  Get-ChocolateyWebFile @hipParams
+
+  $airInstall = 'Adobe AIR\Versions\1.0\Adobe AIR Application Installer.exe'
+  $airPath = $Env:CommonProgramFiles, ${Env:CommonProgramFiles(x86)} |
+    % { Join-Path $_ $airInstall } |
+    ? { Test-Path $_ } |
+    Select -First 1
+
+  if (!$airPath)
+  {
+    Write-ChocolateyFailure $package 'Could not find AIR installer!'
+    return
+  }
+
+  $installPath = Join-Path $Env:ProgramFiles 'Hipchat'
+  $airParams = @('-silent', '-eulaAccepted', '-programMenu',
+     '-location', "`"$installPath`"", "`"$($hipParams.FileFullPath)`"")
+
+  Start-ChocolateyProcessAsAdmin -exeToRun $airPath -statements $airParams
+
+  Write-ChocolateySuccess $package
+} catch {
+  Write-ChocolateyFailure $package "$($_.Exception.Message)"
+  throw
+}
diff --git a/HipChat/tools/chocolateyUninstall.ps1 b/HipChat/tools/chocolateyUninstall.ps1
new file mode 100644
index 0000000..ab21bed
--- /dev/null
+++ b/HipChat/tools/chocolateyUninstall.ps1
@@ -0,0 +1,21 @@
+$package = 'HipChat'
+
+try {
+
+  $hipChatGuid = Get-ChildItem HKLM:\SOFTWARE\Classes\Installer\Products |
+    Get-ItemProperty -Name 'ProductName' |
+    ? { $_.ProductName -eq 'HipChat' } |
+    Select -ExpandProperty PSChildName -First 1
+
+  $properties = Get-ItemProperty HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\$hipChatGuid\InstallProperties
+
+  $pkg = $properties.LocalPackage
+
+  # http://help.adobe.com/en_US/air/redist/WS485a42d56cd19641-70d979a8124ef20a34b-8000.html#WS485a42d56cd19641-70d979a8124ef20a34b-7ffa
+  msiexec.exe /x $pkg /qb-! REBOOT=ReallySuppress
+
+  Write-ChocolateySuccess $package
+} catch {
+  Write-ChocolateyFailure $package "$($_.Exception.Message)"
+  throw
+}