diff --git a/.gitignore b/.gitignore
index 2782e52823..44de56f6ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ epan/dissectors/xcbproto
 epan/dissectors/packet-ncp2222.c
 epan/dissectors/dissectors.c
 epan/dissectors/dissectors.in.txt
-epan/dissectors/make-dissectors
 epan/dtd_parse.c
 epan/dtd_preparse.c
 epan/uat_load.c
@@ -49,13 +48,14 @@ plugins/codecs/*/plugin.c
 plugins/epan/mate/mate_parser.c
 version.h
 tools/lemon/lemon
+tools/make-dissectors
+tools/make-taps
 tshark-tap-register.c
 wiretap/ascend.c
 wiretap/ascend.h
 wiretap/k12text.c
 wiretap/version_info.c
 wireshark-tap-register.c
-ui/make-taps
 
 # CMake #
 ##################
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abde3acf33..8a0c32d515 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1267,7 +1267,7 @@ add_subdirectory( docbook EXCLUDE_FROM_ALL )
 add_subdirectory( epan )
 add_subdirectory( extcap )
 add_subdirectory( randpkt_core )
-add_subdirectory( tools/lemon )
+add_subdirectory( tools )
 add_subdirectory( ui )
 add_subdirectory( wiretap )
 add_subdirectory( writecap )
@@ -1763,7 +1763,6 @@ if(WIN32)
 		)
 	endif(OPTIONAL_DLLS)
 
-	# This might not be needed since make-dissectors has the same dependency.
 	add_dependencies(epan copy_cli_dlls)
 
 	# We have a lot of choices for creating zip archives:
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index b144ca21fe..2db198c7cd 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -1891,13 +1891,6 @@ set(ALL_DISSECTOR_SRC
 	${CORBA_IDL_DISSECTOR_SRC}
 )
 
-add_executable(make-dissectors make-dissectors.c)
-target_link_libraries(make-dissectors ${GLIB2_LIBRARIES})
-
-if(WIN32)
-	add_dependencies(make-dissectors copy_cli_dlls)
-endif()
-
 #
 # We pass the arguments to make-dissectors in a file to avoid limitations
 # with the number of arguments handled by main().
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 0000000000..a45afe13eb
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,32 @@
+# CMakeLists.txt
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+
+add_subdirectory(lemon)
+
+add_executable(make-dissectors make-dissectors.c)
+target_link_libraries(make-dissectors ${GLIB2_LIBRARIES})
+if(WIN32)
+	add_dependencies(make-dissectors copy_cli_dlls)
+endif()
+
+add_executable(make-taps make-taps.c)
+target_link_libraries(make-taps ${GLIB2_LIBRARIES})
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#
diff --git a/epan/dissectors/make-dissectors.c b/tools/make-dissectors.c
similarity index 100%
rename from epan/dissectors/make-dissectors.c
rename to tools/make-dissectors.c
diff --git a/ui/make-taps.c b/tools/make-taps.c
similarity index 100%
rename from ui/make-taps.c
rename to tools/make-taps.c
diff --git a/tools/pre-commit-ignore.conf b/tools/pre-commit-ignore.conf
index e10030d87f..ae9b29e06f 100644
--- a/tools/pre-commit-ignore.conf
+++ b/tools/pre-commit-ignore.conf
@@ -12,7 +12,6 @@
 doc/packet-PROTOABBREV.c
 epan/dissectors/asn1/*/packet-*-template.c
 epan/dissectors/asn1/*/*asn
-epan/dissectors/make-dissectors.c
 epan/nghttp2/*
 epan/wmem/wmem_strbuf.c
 epan/wmem/wmem_strutil.c
@@ -20,6 +19,7 @@ extcap/*
 image/stock_icons/*
 mmdbresolve.c
 tools/lemon/*
+tools/make-dissectors.c
 wsutil/file_util.h
 wsutil/strptime.c
 wsutil/getopt_long.c
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index f258d62f04..b8f828cc4c 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -81,9 +81,6 @@ set_target_properties(ui PROPERTIES
 	FOLDER "UI"
 )
 
-add_executable(make-taps make-taps.c)
-target_link_libraries(make-taps ${GLIB2_LIBRARIES})
-
 if (HTML_HELP_COMPILER)
 	add_definitions(-DHHC_DIR)
 	target_link_libraries(ui Htmlhelp.lib)