diff --git a/Casks/appcode-bundled-jdk.rb b/Casks/appcode-bundled-jdk.rb
new file mode 100644
index 000000000..76a3930a1
--- /dev/null
+++ b/Casks/appcode-bundled-jdk.rb
@@ -0,0 +1,24 @@
+cask :v1 => 'appcode-bundled-jdk' do
+  version '3.2'
+  sha256 'd617f919f9dcb0033c74f3168efb705d6fb2fa5471368df4ef68fc1c18f10a35'
+  
+  url "https://download.jetbrains.com/objc/AppCode-#{version}-custom-jdk-bundled.dmg"
+  name 'AppCode'
+  homepage 'https://www.jetbrains.com/objc/'
+  license :commercial
+
+  app 'AppCode.app'
+
+  zap :delete => [
+                  '~/Library/Preferences/com.jetbrains.AppCode.plist',
+                  '~/Library/Preferences/AppCode32',
+                  '~/Library/Application Support/AppCode32',
+                  '~/Library/Caches/AppCode32',
+                  '~/Library/Logs/AppCode32',
+                 ]
+
+  conflicts_with :cask => [
+                           'appcode',
+                           'appcode-eap',
+                          ]
+end
diff --git a/Casks/appcode-eap.rb b/Casks/appcode-eap.rb
index cdb619772..7a6db1569 100644
--- a/Casks/appcode-eap.rb
+++ b/Casks/appcode-eap.rb
@@ -16,4 +16,9 @@ cask :v1 => 'appcode-eap' do
                   '~/Library/Caches/AppCode33',
                   '~/Library/Logs/AppCode33',
                  ]
+
+  conflicts_with :cask => [
+                           'appcode',
+                           'appcode-bundled-jdk',
+                          ]
 end