diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3416f98e6..b11425b1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2401,14 +2401,6 @@ endif()
 ########################################################################
 
 if(TOOLS)
-  set_src(TWPING_SRC GLOB src/twping twping.cpp)
-  set(TARGET_TWPING twping)
-  add_executable(${TARGET_TWPING} EXCLUDE_FROM_ALL ${TWPING_SRC} $<TARGET_OBJECTS:engine-shared> ${DEPS})
-  target_link_libraries(${TARGET_TWPING} ${LIBS})
-
-  list(APPEND TARGETS_OWN ${TARGET_TWPING})
-  list(APPEND TARGETS_LINK ${TARGET_TWPING})
-
   set(TARGETS_TOOLS)
   set_src(TOOLS_SRC GLOB src/tools
     config_common.h
@@ -2426,6 +2418,7 @@ if(TOOLS)
     map_resave.cpp
     packetgen.cpp
     stun.cpp
+    twping.cpp
     unicode_confusables.cpp
     uuid.cpp
   )
diff --git a/src/twping/twping.cpp b/src/tools/twping.cpp
similarity index 100%
rename from src/twping/twping.cpp
rename to src/tools/twping.cpp