diff --git a/CHANGES b/CHANGES
index eb9d82954a..5e60c05c03 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+5.2.0-dev.19 | 2022-09-27 13:32:20 +0200
+
+  * GH-2422: cmake: Exclude empty directories due to headers install
+    (Arne Welzel, Corelight)
+
 5.2.0-dev.17 | 2022-09-27 13:30:27 +0200
 
   * packet_analysis: Do not raise analyzer_confirmation per-packet for
diff --git a/VERSION b/VERSION
index 53461a40bc..933b8742dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.2.0-dev.17
+5.2.0-dev.19
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b115055e08..8ab1d85a4b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -584,6 +584,12 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
         PATTERN "3rdparty/*" EXCLUDE
         # The "zeek -> ." symlink isn't needed in the install-tree
         REGEX "^${escaped_path}$" EXCLUDE
+
+	# FILES_MATCHING creates empty directories:
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/17122
+	# Exclude the ones that this affects explicitly.
+	PATTERN "script_opt/CPP/maint" EXCLUDE
+	PATTERN "fuzzers/corpora" EXCLUDE
 )
 
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/