diff --git a/JDK7/jdk7.nuspec b/JDK7/jdk7.nuspec
new file mode 100644
index 0000000..0f9ee54
--- /dev/null
+++ b/JDK7/jdk7.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>jdk7</id>
+    <title>Java Platform (JDK) 7</title>
+    <version>7.0.21</version>
+    <authors>Oracle</authors>
+    <owners>Ethan J Brown</owners>
+    <summary>Java Development Kit.  Includes a complete JRE plus tools for developing, debugging, and monitoring Java applications.</summary>
+    <description>Java Development Kit.  Includes a complete JRE plus tools for developing, debugging, and monitoring Java applications.
+
+http://www.oracle.com/technetwork/java/javase/downloads/index.html
+    </description>
+    <projectUrl>http://www.java.com/</projectUrl>
+    <tags>java jdk jre debugger</tags>
+    <licenseUrl>http://www.oracle.com/technetwork/java/javase/terms/license/index.html</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <iconUrl>https://github.com/Iristyle/ChocolateyPackages/raw/master/JDK7/jdk7_logo.jpg</iconUrl>
+    <releaseNotes>http://www.oracle.com/technetwork/java/javase/7u21-relnotes-1932873.html
+    </releaseNotes>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>
diff --git a/JDK7/jdk7_logo.jpg b/JDK7/jdk7_logo.jpg
new file mode 100644
index 0000000..0840cb7
Binary files /dev/null and b/JDK7/jdk7_logo.jpg differ
diff --git a/JDK7/tools/chocolateyInstall.ps1 b/JDK7/tools/chocolateyInstall.ps1
new file mode 100644
index 0000000..819b796
--- /dev/null
+++ b/JDK7/tools/chocolateyInstall.ps1
@@ -0,0 +1,40 @@
+$package = 'jdk7'
+
+try {
+  $IsSytem32Bit = (($Env:PROCESSOR_ARCHITECTURE -eq 'x86') -and `
+    ($Env:PROCESSOR_ARCHITEW6432 -eq $null))
+
+  # http://www.oracle.com/technetwork/java/javase/downloads/index.html
+  $url = if ($IsSytem32Bit)
+    { 'http://download.oracle.com/otn-pub/java/jdk/7u21-b11/jdk-7u21-windows-i586.exe' }
+  else
+    { 'http://download.oracle.com/otn-pub/java/jdk/7u21-b11/jdk-7u21-windows-x64.exe' }
+
+  $chocTemp = Join-Path $Env:TEMP 'chocolatey'
+  $tempInstall = Join-Path $chocTemp 'jdk7\jdk7installer.exe'
+
+  Write-Host "Downloading from $url"
+
+  # had issues with Invoke-WebRequest working properly
+  $client = New-Object Net.WebClient
+  $client.Headers.Add('Cookie',
+    'gpw_e24=http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html')
+  $client.DownloadFile($url, $tempInstall)
+
+  Write-Host "Download from $url complete"
+
+  $params = @{
+    PackageName = $package;
+    FileType = 'exe';
+    # http://docs.oracle.com/javase/7/docs/webnotes/install/windows/jdk-installation-windows.html#Check
+    SilentArgs = '/s';
+    File = $tempInstall;
+  }
+
+  Install-ChocolateyInstallPackage @params
+
+  Write-ChocolateySuccess $package
+} catch {
+  Write-ChocolateyFailure $package "$($_.Exception.Message)"
+  throw
+}