diff --git a/CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj b/CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj
index 1995e3d..bbabbaf 100644
--- a/CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj
+++ b/CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj
@@ -185,6 +185,19 @@
 			name = build_sequoia_iOS;
 			productName = "libetpan-dependencies_macOS";
 		};
+		1585EFAF26A178FE00B822E1 /* build-downloadclient-dependencies_macOS */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 1585EFB226A178FE00B822E1 /* Build configuration list for PBXAggregateTarget "build-downloadclient-dependencies_macOS" */;
+			buildPhases = (
+			);
+			dependencies = (
+				1585EFBA26A1798900B822E1 /* PBXTargetDependency */,
+				1585EFB826A1793700B822E1 /* PBXTargetDependency */,
+				1585EFB626A1793000B822E1 /* PBXTargetDependency */,
+			);
+			name = "build-downloadclient-dependencies_macOS";
+			productName = "build-pEpMIME-dependencies";
+		};
 /* End PBXAggregateTarget section */
 
 /* Begin PBXContainerItemProxy section */
@@ -293,6 +306,27 @@
 			remoteGlobalIDString = 1585EEAA269EDAE200B822E1;
 			remoteInfo = build_pEpengine_macOS;
 		};
+		1585EFB526A1793000B822E1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 1585EE48269ECB8700B822E1;
+			remoteInfo = build_cryptopp_macOS;
+		};
+		1585EFB726A1793700B822E1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 1585EE3E269EC9BB00B822E1;
+			remoteInfo = build_openssl_macOS;
+		};
+		1585EFB926A1798900B822E1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1585EE0B269DC6DD00B822E1 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 1585EE39269EC90100B822E1;
+			remoteInfo = build_boost_macOS;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -345,6 +379,7 @@
 				1585EED4269EF98B00B822E1 /* build_build-macOSAdapter */,
 				1585EE1C269DCEB300B822E1 /* build-libetpan-dependencies_macOS */,
 				1585EE16269DCEA600B822E1 /* build-pEpMIME-dependencies_macOS */,
+				1585EFAF26A178FE00B822E1 /* build-downloadclient-dependencies_macOS */,
 				1585EEFC26A0432A00B822E1 /* CLEAN_ALL */,
 				1585EF0526A0479800B822E1 /* build_sequoia_iOS */,
 			);
@@ -677,6 +712,21 @@
 			target = 1585EEAA269EDAE200B822E1 /* build_pEpengine_macOS */;
 			targetProxy = 1585EF0F26A0537100B822E1 /* PBXContainerItemProxy */;
 		};
+		1585EFB626A1793000B822E1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 1585EE48269ECB8700B822E1 /* build_cryptopp_macOS */;
+			targetProxy = 1585EFB526A1793000B822E1 /* PBXContainerItemProxy */;
+		};
+		1585EFB826A1793700B822E1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 1585EE3E269EC9BB00B822E1 /* build_openssl_macOS */;
+			targetProxy = 1585EFB726A1793700B822E1 /* PBXContainerItemProxy */;
+		};
+		1585EFBA26A1798900B822E1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 1585EE39269EC90100B822E1 /* build_boost_macOS */;
+			targetProxy = 1585EFB926A1798900B822E1 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -962,6 +1012,24 @@
 			};
 			name = Release;
 		};
+		1585EFB326A178FE00B822E1 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = NQLYU6MGPN;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		1585EFB426A178FE00B822E1 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = NQLYU6MGPN;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -1109,6 +1177,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		1585EFB226A178FE00B822E1 /* Build configuration list for PBXAggregateTarget "build-downloadclient-dependencies_macOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1585EFB326A178FE00B822E1 /* Debug */,
+				1585EFB426A178FE00B822E1 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 1585EE0B269DC6DD00B822E1 /* Project object */;
diff --git a/CommonPEPDependencies/CommonPEPDependencies.xcodeproj/xcshareddata/xcschemes/build-downloadclient-dependencies_macOS.xcscheme b/CommonPEPDependencies/CommonPEPDependencies.xcodeproj/xcshareddata/xcschemes/build-downloadclient-dependencies_macOS.xcscheme
new file mode 100644
index 0000000..4f21a40
--- /dev/null
+++ b/CommonPEPDependencies/CommonPEPDependencies.xcodeproj/xcshareddata/xcschemes/build-downloadclient-dependencies_macOS.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1250"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1585EFAF26A178FE00B822E1"
+               BuildableName = "build-downloadclient-dependencies_macOS"
+               BlueprintName = "build-downloadclient-dependencies_macOS"
+               ReferencedContainer = "container:CommonPEPDependencies.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1585EFAF26A178FE00B822E1"
+            BuildableName = "build-downloadclient-dependencies_macOS"
+            BlueprintName = "build-downloadclient-dependencies_macOS"
+            ReferencedContainer = "container:CommonPEPDependencies.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/buildcode/pEpAdapter.code b/buildcode/pEpAdapter.code
index b85556b..dc48291 100644
--- a/buildcode/pEpAdapter.code
+++ b/buildcode/pEpAdapter.code
@@ -3,9 +3,11 @@ if [ -f "${LIB_DIR}/libpEpAdapter.a" ]; then
     exit 0
 fi
 
+VERSION=$(sh "${SCRIPT_DIR}/get-pEp-version.sh" "LIB_PEP_ADAPTER_VERSION")
+
 LIB_PEP_ADAPTER_DIR="${TMP_DIR}/libpEpAdapter"
 if [ ! -d "${LIB_PEP_ADAPTER_DIR}" ]; then
-    git clone -b "${LIB_PEP_ADAPTER_VERSION}" https://gitea.pep.foundation/pEp.foundation/libpEpAdapter
+    git clone -b "${VERSION}" https://gitea.pep.foundation/pEp.foundation/libpEpAdapter
 fi
 export CXXFLAGS="-arch ${ARCH} -isysroot ${SDK_PATH} -std=c++14 -fPIC"
 export LDFLAGS="-arch ${ARCH}"