diff --git a/pw_hdlc/CMakeLists.txt b/pw_hdlc/CMakeLists.txt
index 4f3be46..f6df502 100644
--- a/pw_hdlc/CMakeLists.txt
+++ b/pw_hdlc/CMakeLists.txt
@@ -131,8 +131,8 @@
     hdlc_sys_io_system_server.cc
 )
 
-if(Zephyr_FOUND AND CONFIG_PIGWEED_HDLC)
-  zephyr_link_libraries(pw_hdlc)
+if(Zephyr_FOUND AND CONFIG_PIGWEED_HDLC_RPC)
+  zephyr_link_libraries(pw_hdlc.pw_rpc)
 endif()
 
 pw_add_test(pw_hdlc.decoder_test
diff --git a/pw_hdlc/Kconfig b/pw_hdlc/Kconfig
index de042ed..3fc4c00 100644
--- a/pw_hdlc/Kconfig
+++ b/pw_hdlc/Kconfig
@@ -14,6 +14,11 @@
 
 config PIGWEED_HDLC
     bool "Enable Pigweed HDLC library (pw_hdlc)"
+    select DEPRECATED
+    select PIGWEED_HDLC_RPC
+
+config PIGWEED_HDLC_RPC
+    bool "Enable Pigweed HDLC library (pw_hdlc.pw_rpc)"
     select PIGWEED_ASSERT
     select PIGWEED_BYTES
     select PIGWEED_CHECKSUM
@@ -24,3 +29,4 @@
     select PIGWEED_STREAM
     select PIGWEED_SYS_IO
     select PIGWEED_LOG
+
diff --git a/pw_hdlc/docs.rst b/pw_hdlc/docs.rst
index ee432d3..523a0c4 100644
--- a/pw_hdlc/docs.rst
+++ b/pw_hdlc/docs.rst
@@ -357,5 +357,6 @@
 ------
 Zephyr
 ------
-To enable ``pw_hdlc`` for Zephyr add ``CONFIG_PIGWEED_HDLC=y`` to the project's
-configuration.
+To enable ``pw_hdlc.pw_rpc`` for Zephyr add ``CONFIG_PIGWEED_HDLC_RPC=y`` to
+the project's configuration.
+