diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3cbd2b31f..e18d3984a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -69,10 +69,11 @@ add_definitions(
 )
 
 set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar")
-set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib")
+set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ranlib")
 
 add_definitions(-target x86_64-apple-darwin11)
 include(darling_lib)
+include(darling_static_lib)
 
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/libc/include
diff --git a/src/duct/src/CMakeLists.txt b/src/duct/src/CMakeLists.txt
index e4f61adee..f6d838a5e 100644
--- a/src/duct/src/CMakeLists.txt
+++ b/src/duct/src/CMakeLists.txt
@@ -24,10 +24,7 @@ add_circular(system_duct FAT
 )
 #make_fat(system_duct)
 
-set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar")
-set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib")
-add_library(system_duct_static STATIC ${duct_sources})
+add_darling_static_library(system_duct_static SOURCES ${duct_sources})
 make_fat(system_duct_static)
-add_dependencies(system_duct_static ranlib x86_64-apple-darwin11-ar)
 
 install(TARGETS system_duct DESTINATION libexec/darling/usr/lib/system)
diff --git a/src/external/compiler-rt b/src/external/compiler-rt
index fc763d0a0..08b171827 160000
--- a/src/external/compiler-rt
+++ b/src/external/compiler-rt
@@ -1 +1 @@
-Subproject commit fc763d0a0bee9903e010255a82153b7d3040438a
+Subproject commit 08b17182770d924fdc20b4887634eceaf500b072
diff --git a/src/external/libclosure b/src/external/libclosure
index 3f4b49a3f..113b8f68d 160000
--- a/src/external/libclosure
+++ b/src/external/libclosure
@@ -1 +1 @@
-Subproject commit 3f4b49a3f330e353e334668d26699a53d19344da
+Subproject commit 113b8f68deb3dea7f060c398ddae88666add8596
diff --git a/src/external/libcxx b/src/external/libcxx
index 48706becd..92147ed2a 160000
--- a/src/external/libcxx
+++ b/src/external/libcxx
@@ -1 +1 @@
-Subproject commit 48706becdc9ccfdd9a098a81aedbf97f307a484d
+Subproject commit 92147ed2a45be6ea1b1ad0c97dfe873c47d0c163
diff --git a/src/external/libcxxabi b/src/external/libcxxabi
index d54413e65..5b9b2821d 160000
--- a/src/external/libcxxabi
+++ b/src/external/libcxxabi
@@ -1 +1 @@
-Subproject commit d54413e6552c8faa9b32becda58c9c16e19c5119
+Subproject commit 5b9b2821d3427256e4b32348672fbb69a0bc685e
diff --git a/src/external/libplatform b/src/external/libplatform
index 9bc555a9f..dbbdafa63 160000
--- a/src/external/libplatform
+++ b/src/external/libplatform
@@ -1 +1 @@
-Subproject commit 9bc555a9f57208754bb7e57391dd1c17af4599dd
+Subproject commit dbbdafa63c69058a46e41cae06f7380e28026336
diff --git a/src/external/libpthread b/src/external/libpthread
index 850530cdb..7be6a6e90 160000
--- a/src/external/libpthread
+++ b/src/external/libpthread
@@ -1 +1 @@
-Subproject commit 850530cdb55a14c82eee7b832912bb5291d2453e
+Subproject commit 7be6a6e905f901c8418b769f6afe4ee488f66765
diff --git a/src/keymgr/CMakeLists.txt b/src/keymgr/CMakeLists.txt
index ffdcd2a17..2157f3e6a 100644
--- a/src/keymgr/CMakeLists.txt
+++ b/src/keymgr/CMakeLists.txt
@@ -30,10 +30,7 @@ add_circular(keymgr FAT
 #target_link_libraries(keymgr PRIVATE system_c system_dyld system_malloc system_pthread)
 #make_fat(keymgr)
 
-set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar")
-set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib")
-add_library(keymgr_static STATIC ${keymgr_sources})
+add_darling_static_library(keymgr_static SOURCES ${keymgr_sources})
 make_fat(keymgr_static)
-add_dependencies(keymgr_static ranlib x86_64-apple-darwin11-ar)
 
 install(TARGETS keymgr DESTINATION libexec/darling/usr/lib/system)
diff --git a/src/libm/CMakeLists.txt b/src/libm/CMakeLists.txt
index 681d0309a..93d198df7 100644
--- a/src/libm/CMakeLists.txt
+++ b/src/libm/CMakeLists.txt
@@ -175,7 +175,6 @@ add_circular(system_m FAT
 install(TARGETS system_m DESTINATION libexec/darling/usr/lib/system)
 
 set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar")
-set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib")
-add_library(system_m_static STATIC ${libm_sources} $<TARGET_OBJECTS:system_m_extra>)
-add_dependencies(system_m_static ranlib x86_64-apple-darwin11-ar)
+set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ranlib")
+add_darling_static_library(system_m_static SOURCES ${libm_sources} $<TARGET_OBJECTS:system_m_extra>)
 make_fat(system_m_static)