diff --git a/targets/rp2040/BUILD.gn b/targets/rp2040/BUILD.gn
index 661f954..6c7d9e7 100644
--- a/targets/rp2040/BUILD.gn
+++ b/targets/rp2040/BUILD.gn
@@ -46,10 +46,7 @@
   scheduler = PW_SYSTEM_SCHEDULER.FREERTOS
   use_pw_malloc = false
 
-  # This is critical because otherwise the Pico SDK will emit \r\n every time
-  # a \n is written out over serial.
-  global_configs =
-      [ "//third_party/pigweed/targets/rp2040_pw_system:rp2040_hal_config" ]
+  global_configs = [ "$dir_pigweed/targets/rp2040:rp2040_hal_config" ]
 
   build_args = {
     pw_build_EXECUTABLE_TARGET_TYPE = "pico_executable"
diff --git a/third_party/pigweed b/third_party/pigweed
index 72840bd..5f27e81 160000
--- a/third_party/pigweed
+++ b/third_party/pigweed
@@ -1 +1 @@
-Subproject commit 72840bdfdc5b67d2cfcc05c5dc1c4f22fd7860a2
+Subproject commit 5f27e8171fe5207859ee7af46a9c1d6f5809e3c9
diff --git a/third_party/pigweed-experimental b/third_party/pigweed-experimental
index d8f0046..72a8143 160000
--- a/third_party/pigweed-experimental
+++ b/third_party/pigweed-experimental
@@ -1 +1 @@
-Subproject commit d8f00464ff76ea058ac4f861098b5a80d7cc1710
+Subproject commit 72a8143ae7043f453cfd3095d20962f9be774ec5