diff --git a/lib/DriverTool/autolink_extract_main.cpp b/lib/DriverTool/autolink_extract_main.cpp
index c74a473fce0e9..332778d581d95 100644
--- a/lib/DriverTool/autolink_extract_main.cpp
+++ b/lib/DriverTool/autolink_extract_main.cpp
@@ -228,9 +228,10 @@ int autolink_extract_main(ArrayRef<const char *> Args, const char *Argv0,
       "-lswiftCore",
       "-lswift_Concurrency",
       "-lswift_StringProcessing",
-      "-lswift_RegexBuilder",
+      "-lswiftRegexBuilder",
       "-lswift_RegexParser",
       "-lswift_Backtracing",
+      "-lswiftSynchronization",
       "-lswiftGlibc",
       "-lBlocksRuntime",
       // Dispatch-specific Swift runtime libs
@@ -238,20 +239,20 @@ int autolink_extract_main(ArrayRef<const char *> Args, const char *Argv0,
       "-lDispatchStubs",
       "-lswiftDispatch",
       // CoreFoundation and Foundation Swift runtime libs
+      "-l_FoundationICU",
       "-lCoreFoundation",
       "-lFoundation",
+      "-lFoundationEssentials",
+      "-lFoundationInternationalization",
       "-lFoundationNetworking",
       "-lFoundationXML",
       // Foundation support libs
       "-lcurl",
       "-lxml2",
       "-luuid",
+      "-lTesting",
       // XCTest runtime libs (must be first due to http://github.com/apple/swift-corelibs-xctest/issues/432)
       "-lXCTest",
-      // ICU Swift runtime libs
-      "-licui18nswift",
-      "-licuucswift",
-      "-licudataswift",
       // Common-use ordering-agnostic Linux system libs
       "-lm",
       "-lpthread",