diff --git a/CGMBLEKit.xcodeproj/project.pbxproj b/CGMBLEKit.xcodeproj/project.pbxproj
index c9c8ec6d..501ccc2b 100644
--- a/CGMBLEKit.xcodeproj/project.pbxproj
+++ b/CGMBLEKit.xcodeproj/project.pbxproj
@@ -868,7 +868,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -f $PROJECT_DIR/.gitmodules ]; then\n    echo \"Skipping checkout due to presence of .gitmodules file\"\n    if [ $ACTION = \"install\" ]; then\n        echo \"You're installing: Make sure to keep all submodules up-to-date and run carthage build after changes.\"\n    fi\nelse\n    echo \"Bootstrapping carthage dependencies\"\n    /usr/local/bin/carthage bootstrap --project-directory \"$SRCROOT\" --cache-builds\nfi";
+			shellScript = "if [ \"$CARTHAGE\" = \"YES\" ]; then\n    echo \"Skipping carthage build because we're already in one\"\nelif [ -f $PROJECT_DIR/.gitmodules ]; then\n    echo \"Skipping checkout due to presence of .gitmodules file\"\n    if [ $ACTION = \"install\" ]; then\n        echo \"You're installing: Make sure to keep all submodules up-to-date and run carthage build after changes.\"\n    fi\nelse\n    echo \"Bootstrapping carthage dependencies\"\n    /usr/local/bin/carthage bootstrap --project-directory \"$SRCROOT\" --cache-builds\nfi\n";
 		};
 		43A8EC46210D093900A81379 /* Copy Frameworks with Carthage */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/Cartfile b/Cartfile
index 092d4e5f..7c122cc9 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,2 +1,2 @@
 github "LoopKit/LoopKit" "dev"
-github "mddub/dexcom-share-client-swift" "master"
+github "LoopKit/dexcom-share-client-swift" "carthage-recursive"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 7e079d02..5b37af85 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "LoopKit/LoopKit" "49529abbc18f8f0d8d986eb2e6fe9779314e3230"
-github "mddub/dexcom-share-client-swift" "3bb71d64314c6d2e3c53a784082d4978b390cdc6"
+github "LoopKit/LoopKit" "8c553f7bd03c2032b146e4a52d58d527a4285c15"
+github "LoopKit/dexcom-share-client-swift" "f0125aed8960586a9473dca02d17b3e5969558ac"