diff --git a/.travis.yml b/.travis.yml
index 78b50d8440..238a675a46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ script:
   - set -o pipefail
   - COMMAND="xcodebuild -project '$PROJECT' -scheme '$SCHEME' -sdk '$SDK' -configuration '$CONFIGURATION'"
   - if [ $RUN_TESTS == "YES" ]; then
-      COMMAND+=" -destination '$DESTINATION' clean test";
+      COMMAND+=" -destination '$DESTINATION' XCODEBUILD_GCC_PREPROCESSOR_DEFINITIONS="CI=1" clean test";
     fi
   - COMMAND+=" | xcpretty -c"
   - echo $COMMAND
diff --git a/HockeySDK-Source.podspec b/HockeySDK-Source.podspec
index 2813a2b431..e45efbbc40 100644
--- a/HockeySDK-Source.podspec
+++ b/HockeySDK-Source.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'HockeySDK-Source'
-  s.version           = '3.8.1'
+  s.version           = '3.8.2'
 
   s.summary           = 'Collect live crash reports, get feedback from your users, distribute your betas, and analyze your test coverage with HockeyApp.'
   s.description       = <<-DESC
@@ -12,13 +12,13 @@ Pod::Spec.new do |s|
                         DESC
 
   s.homepage          = 'http://hockeyapp.net/'
-  s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.8.1/'
+  s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.8.2/'
 
   s.license           = 'MIT'
   s.author            = { 'Andreas Linde' => 'mail@andreaslinde.de', 'Thomas Dohmke' => "thomas@dohmke.de" }
   s.source            = { :git => 'https://github.com/bitstadium/HockeySDK-iOS.git', :tag => s.version.to_s }
 
-  s.platform          = :ios, '9.0'
+  s.platform          = :ios, '7.0'
   s.ios.deployment_target = '6.0'
   s.source_files      = 'Classes'
   s.requires_arc      = true
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.frameworks              = 'AssetsLibrary', 'CoreText', 'CoreGraphics', 'MobileCoreServices', 'QuartzCore', 'QuickLook', 'Security', 'SystemConfiguration', 'UIKit'
   s.libraries = 'c++'
   s.ios.vendored_frameworks = 'Vendor/CrashReporter.framework'
-  s.xcconfig                = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_C_VERSION="\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"53\\"" BITHOCKEY_C_BUILD="\\"53\\""} }
+  s.xcconfig                = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_C_VERSION="\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"54\\"" BITHOCKEY_C_BUILD="\\"54\\""} }
   s.resource_bundle         = { 'HockeySDKResources' => ['Resources/*.png', 'Resources/*.lproj'] }
   s.preserve_paths          = 'Resources', 'Support'
   s.private_header_files  = 'Classes/*Private.h'
diff --git a/HockeySDK.podspec b/HockeySDK.podspec
index 5468315e4a..6ca7d8a939 100644
--- a/HockeySDK.podspec
+++ b/HockeySDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'HockeySDK'
-  s.version           = '3.8.1'
+  s.version           = '3.8.2'
 
   s.summary           = 'Collect live crash reports, get feedback from your users, distribute your betas, and analyze your test coverage with HockeyApp.'
   s.description       = <<-DESC
@@ -12,12 +12,12 @@ Pod::Spec.new do |s|
                         DESC
 
   s.homepage          = 'http://hockeyapp.net/'
-  s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.8.1/'
+  s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.8.2/'
 
   s.license           = { :type => 'MIT', :file => 'HockeySDK-iOS/LICENSE' }
   s.author            = { 'Andreas Linde' => 'mail@andreaslinde.de', 'Thomas Dohmke' => "thomas@dohmke.de" }
 
-  s.platform          = :ios, '9.0'
+  s.platform          = :ios, '7.0'
   s.ios.deployment_target = '6.0'
   s.requires_arc      = true
   
diff --git a/README.md b/README.md
index 4a12aede77..71c26084e0 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 [![Build Status](https://travis-ci.org/bitstadium/HockeySDK-iOS.svg?branch=master)](https://travis-ci.org/bitstadium/HockeySDK-iOS)
 
-## Version 3.8.1
+## Version 3.8.2
 
-- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.8.1/docs/docs/Changelog.html)
+- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.8.2/docs/docs/Changelog.html)
 
 ## Introduction
 
@@ -455,7 +455,7 @@ To check if data is send properly to HockeyApp and also see some additional SDK
 <a id="documentation"></a>
 ## 4. Documentation
 
-Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/3.8.1/index.html).
+Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/3.8.2/index.html).
 
 <a id="troubleshooting"></a>
 ## 5.Troubleshooting
@@ -469,7 +469,7 @@ Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/
     Make sure none of the following files are copied into your app bundle, check under app target, `Build Phases`, `Copy Bundle Resources` or in the `.app` bundle after building:
 
         - `HockeySDK.framework` (except if you build a dynamic framework version of the SDK yourself!)
-        - `de.bitstadium.HockeySDK-iOS-3.8.1.docset`
+        - `de.bitstadium.HockeySDK-iOS-3.8.2.docset`
 
 3. Feature are not working as expected
 
diff --git a/Support/HockeySDK.xcconfig b/Support/HockeySDK.xcconfig
index 2b0a43933c..07bd4f0f14 100644
--- a/Support/HockeySDK.xcconfig
+++ b/Support/HockeySDK.xcconfig
@@ -1,3 +1,3 @@
 OTHER_LDFLAGS=$(inherited) -framework CoreText -framework CoreGraphics -framework Foundation -framework QuartzCore -framework SystemConfiguration -framework UIKit -framework Security -framework AssetsLibrary -framework MobileCoreServices -framework QuickLook -lc++
 HOCKEYSDK_DOCSET_NAME=HockeySDK-iOS
-GCC_PREPROCESSOR_DEFINITIONS=$(inherited) CONFIGURATION_$(CONFIGURATION)
+HOCKEYSDK_GCC_PREPROCESSOR_DEFINITIONS=$(inherited) $(XCODEBUILD_GCC_PREPROCESSOR_DEFINITIONS)
diff --git a/Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK.xcscheme b/Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK.xcscheme
index e0c67e54e2..c22f624c0d 100644
--- a/Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK.xcscheme
+++ b/Support/HockeySDK.xcodeproj/xcshareddata/xcschemes/HockeySDK.xcscheme
@@ -59,7 +59,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "ReleaseCrashOnlyWatchOS"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/Support/HockeySDKTests/BITCrashManagerTests.m b/Support/HockeySDKTests/BITCrashManagerTests.m
index 12e3d2808a..dd028ed314 100644
--- a/Support/HockeySDKTests/BITCrashManagerTests.m
+++ b/Support/HockeySDKTests/BITCrashManagerTests.m
@@ -205,18 +205,19 @@
 }
 
 #pragma mark - Debugger
-
+/**
+ * The test is currently disabled because it fails for unknown reasons when being run using xcodebuild.
+ * This occurs for example on our current CI solution. Will be reenabled as soon as we find a fix.
+*/
+#ifndef CI
 /**
  *  We are running this usually witin Xcode
  *  TODO: what to do if we do run this e.g. on Jenkins or Xcode bots ?
  */
-/*
- * The test is currently disabled because it fails for unknown reasons when being run using xcodebuild.
- * This occurs for example on our current CI solution. Will be reenabled as soon as we find a fix.
 - (void)testIsDebuggerAttached {
   assertThatBool([_sut isDebuggerAttached], equalToBool(YES));
 }
-*/
+#endif
 
 #pragma mark - Helper
 
diff --git a/Support/buildnumber.xcconfig b/Support/buildnumber.xcconfig
index d909004d6c..f741836004 100644
--- a/Support/buildnumber.xcconfig
+++ b/Support/buildnumber.xcconfig
@@ -1,8 +1,8 @@
 #include "HockeySDK.xcconfig"
 
-BUILD_NUMBER = 53
-VERSION_STRING = 3.8.1
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\""
+BUILD_NUMBER = 54
+VERSION_STRING = 3.8.2
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(HOCKEYSDK_GCC_PREPROCESSOR_DEFINITIONS) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\""
 BIT_ARM_ARCHS = armv7 armv7s arm64
 BIT_SIM_ARCHS = x86_64 i386
 ARCHS = $(BIT_ARM_ARCHS)
diff --git a/Support/release.xcconfig b/Support/release.xcconfig
index 6c56be8f87..4b7cda56e4 100644
--- a/Support/release.xcconfig
+++ b/Support/release.xcconfig
@@ -1,4 +1,4 @@
 #include "buildnumber.xcconfig"
 
 OTHER_CFLAGS[sdk=iphoneos9.*] = -Wshorten-64-to-32 -Wall -fembed-bitcode
-OTHER_CFLAGS[sdk=iphonesimulator9.*] = -Wshorten-64-to-32 -Wall -fembed-bitcode
+OTHER_CFLAGS[sdk=iphonesimulator9.*] = -Wshorten-64-to-32 -Wall
diff --git a/Vendor/CrashReporter.framework/Versions/A/CrashReporter b/Vendor/CrashReporter.framework/Versions/A/CrashReporter
index c63e914a6b..6262df86c5 100644
Binary files a/Vendor/CrashReporter.framework/Versions/A/CrashReporter and b/Vendor/CrashReporter.framework/Versions/A/CrashReporter differ
diff --git a/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist b/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist
index 2b20300a8b..d83fe7d429 100644
--- a/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist
+++ b/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist
@@ -18,6 +18,10 @@
 	<string>FMWK</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>DTCompiler</key>
@@ -29,7 +33,7 @@
 	<key>DTSDKBuild</key>
 	<string>15A278</string>
 	<key>DTSDKName</key>
-	<string>macosx10.10</string>
+	<string>macosx10.11</string>
 	<key>DTXcode</key>
 	<string>0700</string>
 	<key>DTXcodeBuild</key>
diff --git a/docs/Changelog-template.md b/docs/Changelog-template.md
index 70c982af2b..d795d7d3aa 100644
--- a/docs/Changelog-template.md
+++ b/docs/Changelog-template.md
@@ -1,3 +1,9 @@
+## Version 3.8.2
+
+- [UPDATE] Added support for Xcode 6.x 
+- [UPDATE] Requires iOS 7 or later as base SDK, deployment target iOS 6 or later
+- [UPDATE] Updated PLCrashReporter build to exclude Bitcode in Simulator slices
+
 ## Version 3.8.1
 
 - [UPDATE] Updated PLCrashReporter build using Xcode 7 (7A220)
diff --git a/docs/Guide-Installation-Setup-template.md b/docs/Guide-Installation-Setup-template.md
index 1d5d0664da..0d09775c84 100644
--- a/docs/Guide-Installation-Setup-template.md
+++ b/docs/Guide-Installation-Setup-template.md
@@ -1,6 +1,6 @@
-## Version 3.8.1
+## Version 3.8.2
 
-- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.8.1/docs/docs/Changelog.html)
+- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.8.2/docs/docs/Changelog.html)
 
 ## Introduction
 
@@ -439,7 +439,7 @@ To check if data is send properly to HockeyApp and also see some additional SDK
 <a id="documentation"></a>
 ## 4. Documentation
 
-Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/3.8.1/index.html).
+Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/3.8.2/index.html).
 
 <a id="troubleshooting"></a>
 ## 5.Troubleshooting
@@ -453,7 +453,7 @@ Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/
     Make sure none of the following files are copied into your app bundle, check under app target, `Build Phases`, `Copy Bundle Resources` or in the `.app` bundle after building:
 
         - `HockeySDK.framework` (except if you build a dynamic framework version of the SDK yourself!)
-        - `de.bitstadium.HockeySDK-iOS-3.8.1.docset`
+        - `de.bitstadium.HockeySDK-iOS-3.8.2.docset`
 
 3. Feature are not working as expected