diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ed2fb5d0..e1ef82107 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,14 @@ not enabled.
 A new optional parameter `enable_placement_id` was added to the `sock_impl_set_options`
 RPC.
 
+### Miscellaneous
+
+The contents of the log_rpc library have been moved to the event library. The log_rpc
+library now no longer exists.
+
+The contents of the app_rpc library have been moved to the event library. The app_rpc
+library now no longer exists.
+
 ## v20.07: SPDK CSI driver, new accel_fw commands, I/O abort support
 
 ### accel
diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile
index f3c13ea4b..3a86fb969 100644
--- a/app/iscsi_tgt/Makefile
+++ b/app/iscsi_tgt/Makefile
@@ -46,7 +46,7 @@ C_SRCS := iscsi_tgt.c
 SPDK_LIB_LIST = $(ALL_MODULES_LIST)
 SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_iscsi event_net event_scsi event
 SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi accel trace conf
-SPDK_LIB_LIST += thread util log app_rpc net sock notify
+SPDK_LIB_LIST += thread util log net sock notify
 
 ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV))
 SPDK_LIB_LIST += env_dpdk_rpc
diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile
index 54e8356ef..a30e56d47 100644
--- a/app/nvmf_tgt/Makefile
+++ b/app/nvmf_tgt/Makefile
@@ -42,7 +42,7 @@ C_SRCS := nvmf_main.c
 SPDK_LIB_LIST = $(ALL_MODULES_LIST)
 SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_nvmf event_net
 SPDK_LIB_LIST += nvmf event log trace conf thread util bdev accel rpc jsonrpc json net sock
-SPDK_LIB_LIST += app_rpc bdev_rpc notify
+SPDK_LIB_LIST += bdev_rpc notify
 
 ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV))
 SPDK_LIB_LIST += env_dpdk_rpc
diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile
index ae9d9b95a..454cda4a6 100644
--- a/app/spdk_tgt/Makefile
+++ b/app/spdk_tgt/Makefile
@@ -52,7 +52,7 @@ endif
 
 SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_iscsi event_net event_scsi event_nvmf event
 SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi accel rpc jsonrpc json
-SPDK_LIB_LIST += app_rpc bdev_rpc net sock notify
+SPDK_LIB_LIST += bdev_rpc net sock notify
 
 ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV))
 SPDK_LIB_LIST += env_dpdk_rpc
diff --git a/app/vhost/Makefile b/app/vhost/Makefile
index 5a9166eb9..e0d48db42 100644
--- a/app/vhost/Makefile
+++ b/app/vhost/Makefile
@@ -48,7 +48,7 @@ endif
 
 SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_net event_scsi event
 SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi accel trace conf
-SPDK_LIB_LIST += thread util log app_rpc
+SPDK_LIB_LIST += thread util log
 SPDK_LIB_LIST += event_nbd nbd net sock notify
 
 ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV))
diff --git a/lib/event/Makefile b/lib/event/Makefile
index cb5d79b5f..ccdfc5adc 100644
--- a/lib/event/Makefile
+++ b/lib/event/Makefile
@@ -38,7 +38,8 @@ SO_VER := 5
 SO_MINOR := 0
 
 LIBNAME = event
-C_SRCS = app.c reactor.c rpc.c subsystem.c json_config.c log_rpc.c
+C_SRCS = app.c reactor.c rpc.c subsystem.c json_config.c log_rpc.c \
+	 app_rpc.c subsystem_rpc.c
 
 SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_event.map)
 
diff --git a/module/event/rpc/app_rpc.c b/lib/event/app_rpc.c
similarity index 100%
rename from module/event/rpc/app_rpc.c
rename to lib/event/app_rpc.c
diff --git a/module/event/rpc/subsystem_rpc.c b/lib/event/subsystem_rpc.c
similarity index 100%
rename from module/event/rpc/subsystem_rpc.c
rename to lib/event/subsystem_rpc.c
diff --git a/mk/spdk.lib_deps.mk b/mk/spdk.lib_deps.mk
index fc51e4bc6..81d43e213 100644
--- a/mk/spdk.lib_deps.mk
+++ b/mk/spdk.lib_deps.mk
@@ -153,8 +153,6 @@ DEPDIRS-bdev_uring := $(BDEV_DEPS_CONF_THREAD)
 DEPDIRS-bdev_virtio := $(BDEV_DEPS_CONF_THREAD) virtio
 
 # module/event
-# module/event/app
-DEPDIRS-app_rpc := log util thread event $(JSON_LIBS)
 
 # module/event/subsystems
 # These depdirs include subsystem interdependencies which
diff --git a/module/event/Makefile b/module/event/Makefile
index f4caea64e..00a6831c4 100644
--- a/module/event/Makefile
+++ b/module/event/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-DIRS-y = subsystems rpc
+DIRS-y = subsystems
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/module/event/rpc/Makefile b/module/event/rpc/Makefile
deleted file mode 100644
index 1e620aa14..000000000
--- a/module/event/rpc/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  BSD LICENSE
-#
-#  Copyright (c) Intel Corporation.
-#  All rights reserved.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#    * Redistributions of source code must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright
-#      notice, this list of conditions and the following disclaimer in
-#      the documentation and/or other materials provided with the
-#      distribution.
-#    * Neither the name of Intel Corporation nor the names of its
-#      contributors may be used to endorse or promote products derived
-#      from this software without specific prior written permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
-include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
-
-SO_VER := 2
-SO_MINOR := 0
-
-C_SRCS = app_rpc.c subsystem_rpc.c
-LIBNAME = app_rpc
-
-SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map
-
-include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile
index ef2f6b1fc..2ff54d1c1 100644
--- a/test/app/bdev_svc/Makefile
+++ b/test/app/bdev_svc/Makefile
@@ -42,7 +42,7 @@ C_SRCS := bdev_svc.c
 SPDK_LIB_LIST = $(ALL_MODULES_LIST)
 SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM)
 SPDK_LIB_LIST += nvmf event log trace conf thread util bdev accel rpc jsonrpc json sock blobfs_bdev
-SPDK_LIB_LIST += app_rpc bdev_rpc notify
+SPDK_LIB_LIST += bdev_rpc notify
 
 ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd nbd
diff --git a/test/bdev/bdevio/Makefile b/test/bdev/bdevio/Makefile
index 83aca58ca..902096939 100644
--- a/test/bdev/bdevio/Makefile
+++ b/test/bdev/bdevio/Makefile
@@ -41,7 +41,7 @@ C_SRCS := bdevio.c
 
 SPDK_LIB_LIST = $(ALL_MODULES_LIST)
 SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM)
-SPDK_LIB_LIST += app_rpc bdev bdev_rpc accel event trace log conf thread util rpc jsonrpc json sock notify
+SPDK_LIB_LIST += bdev bdev_rpc accel event trace log conf thread util rpc jsonrpc json sock notify
 
 LIBS += -lcunit
 
diff --git a/test/bdev/bdevperf/Makefile b/test/bdev/bdevperf/Makefile
index e20a153aa..fb2d03eae 100644
--- a/test/bdev/bdevperf/Makefile
+++ b/test/bdev/bdevperf/Makefile
@@ -42,7 +42,7 @@ C_SRCS := bdevperf.c
 SPDK_LIB_LIST = $(ALL_MODULES_LIST)
 SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM)
 SPDK_LIB_LIST += bdev accel event trace log conf thread util sock notify
-SPDK_LIB_LIST += rpc jsonrpc json app_rpc bdev_rpc
+SPDK_LIB_LIST += rpc jsonrpc json bdev_rpc
 
 ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd nbd
diff --git a/test/event/app_repeat/Makefile b/test/event/app_repeat/Makefile
index ef3e88bdb..3fc9fc509 100644
--- a/test/event/app_repeat/Makefile
+++ b/test/event/app_repeat/Makefile
@@ -42,7 +42,7 @@ C_SRCS := app_repeat.c
 # the repeatable ones.
 SPDK_LIB_LIST = event_bdev event_accel event_vmd event_sock
 SPDK_LIB_LIST += event log trace conf thread util bdev accel rpc jsonrpc json sock vmd
-SPDK_LIB_LIST += app_rpc bdev_rpc notify
+SPDK_LIB_LIST += bdev_rpc notify
 SPDK_LIB_LIST += event_nbd nbd
 
 BLOCKDEV_LIST = bdev_malloc bdev_null