diff --git a/configure b/configure
index 4de2fbb714b4c37ae4c1f79a5bc470e3b727c1e3..99738868d97477be9bb81158cc96ace97c163535 100755
--- a/configure
+++ b/configure
@@ -2814,9 +2814,9 @@ if [ "$CFG_FORCEDEBUGINFO" = "yes" ]; then
     QMAKE_CONFIG="$QMAKE_CONFIG force_debug_info"
 fi
 
-# iOS builds should be static to be able to submit to the App Store
 if [ "$XPLATFORM_IOS" = "yes" ]; then
-    CFG_SHARED="no"
+    CFG_SHARED="no" # iOS builds should be static to be able to submit to the App Store
+    CFG_CXX11="no" # C++11 support disabled for now
 fi
 
 # disable GTK style support auto-detection on Mac
diff --git a/mkspecs/common/clang-mac.conf b/mkspecs/common/clang-mac.conf
index efe771d24de6cf312deeeb88f70a02d7f69ee1d2..3280274f3694e2fc77e5273a965f45f16530e4b6 100644
--- a/mkspecs/common/clang-mac.conf
+++ b/mkspecs/common/clang-mac.conf
@@ -5,3 +5,6 @@ QMAKE_OBJCXXFLAGS_PRECOMPILE     = -x objective-c++-header -c ${QMAKE_PCH_INPUT}
 QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
 
 QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
+
+QMAKE_CXXFLAGS_CXX11 += -stdlib=libc++
+QMAKE_LFLAGS_CXX11   += -stdlib=libc++
diff --git a/mkspecs/features/c++11.prf b/mkspecs/features/c++11.prf
index 4b56fa9fd24f1eef80c01503b38baa2f2646e99b..32eaca4a9b5ae4552f99becfb0e5ba13636174ab 100644
--- a/mkspecs/features/c++11.prf
+++ b/mkspecs/features/c++11.prf
@@ -1,3 +1,10 @@
 QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_CXX11
 QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CXXFLAGS_CXX11
 QMAKE_LFLAGS += $$QMAKE_LFLAGS_CXX11
+
+contains(QMAKE_LFLAGS, -stdlib=libc++) {
+    equals(QMAKE_MACOSX_DEPLOYMENT_TARGET, 10.6): \
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+    contains(QMAKE_IOS_DEPLOYMENT_TARGET, ^4.*): \
+        QMAKE_IOS_DEPLOYMENT_TARGET = 5.0
+}
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index eaa3108a8bc56657251405f159caed953f521fa2..10d94bed11d10576727902f71085828fc2c6bea5 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -40,6 +40,9 @@ isEmpty(QMAKE_MAC_PLATFORM_NAME): error("Could not resolve platform name for SDK
     # FIXME: Get the version_min_flag out of the platform's 'Native Build System.xcspec'
     version_identifier = $$replace(QMAKE_MAC_PLATFORM_NAME, iphonesimulator, ios-simulator)
 
+    # C++11 support may affect the deployment target
+    c++11: load(c++11)
+
     ios:!host_build: \
         deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET
     else: \