diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8daae70..8a6ff786 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Master
 
+* Add a setting for Module Stability (BUILD_LIBRARY_FOR_DISTRIBUTION).
+  Fixes that it failed to compile using Carthage on Xcode12. [@soranoba](https://github.com/soranoba)
 * Added `hasFormBody(_:)` matcher.  
 [@417-72KI](https://github.com/417-72KI)
 * Added fix for Xcode 12 - Warnings related to iOS 8 support (Swift Package Manager) #328
diff --git a/OHHTTPStubs.xcodeproj/project.pbxproj b/OHHTTPStubs.xcodeproj/project.pbxproj
index ac4e60a5..37b21bf6 100644
--- a/OHHTTPStubs.xcodeproj/project.pbxproj
+++ b/OHHTTPStubs.xcodeproj/project.pbxproj
@@ -1160,6 +1160,7 @@
 			baseConfigurationReference = 1FE7BADB223157DB00FFF120 /* OHHTTPStubsProject.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1222,6 +1223,7 @@
 			baseConfigurationReference = 1FE7BADB223157DB00FFF120 /* OHHTTPStubsProject.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";