diff --git a/pandatool/CMakeLists.txt b/pandatool/CMakeLists.txt
index 785a35bdb1..9b90217e03 100644
--- a/pandatool/CMakeLists.txt
+++ b/pandatool/CMakeLists.txt
@@ -5,3 +5,5 @@ endif()
 # Include pandatool source directories
 add_subdirectory(src/pandatoolbase)
 add_subdirectory(src/progbase)
+add_subdirectory(src/pstatserver)
+add_subdirectory(src/gtk-stats)
diff --git a/pandatool/src/gtk-stats/CMakeLists.txt b/pandatool/src/gtk-stats/CMakeLists.txt
new file mode 100644
index 0000000000..40561bd856
--- /dev/null
+++ b/pandatool/src/gtk-stats/CMakeLists.txt
@@ -0,0 +1,38 @@
+if(HAVE_GTK2 AND HAVE_NET)
+  set(GTKSTATS_HEADERS
+      gtkStatsChartMenu.h
+      gtkStatsGraph.h
+      gtkStatsLabel.h
+      gtkStatsLabelStack.h
+      gtkStatsMenuId.h
+      gtkStatsMonitor.h gtkStatsMonitor.I
+      gtkStatsPianoRoll.h
+      gtkStatsServer.h
+      gtkStatsStripChart.h)
+
+  set(GTKSTATS_SOURCES
+      gtkStats.cxx
+      gtkStatsChartMenu.cxx
+      gtkStatsGraph.cxx
+      gtkStatsLabel.cxx
+      gtkStatsLabelStack.cxx
+      gtkStatsMonitor.cxx
+      gtkStatsPianoRoll.cxx
+      gtkStatsServer.cxx
+      gtkStatsStripChart.cxx)
+
+  composite_sources(gtkstats GTKSTATS_SOURCES)
+  add_executable(gtkstats ${GTKSTATS_HEADERS} ${GTKSTATS_SOURCES})
+  target_link_libraries(gtkstats p3progbase p3pstatserver p3pystub)
+  target_use_packages(gtkstats GTK2)
+
+  # This program is NOT actually called gtkstats. It's pstats-gtk on Win32 and
+  # pstats everywhere else (as the Win32 GUI is not built).
+  if(WIN32)
+    set_target_properties(gtkstats PROPERTIES OUTPUT_NAME "pstats-gtk")
+  else()
+    set_target_properties(gtkstats PROPERTIES OUTPUT_NAME "pstats")
+  endif()
+
+  install(TARGETS gtkstats DESTINATION bin)
+endif()
diff --git a/pandatool/src/pstatserver/CMakeLists.txt b/pandatool/src/pstatserver/CMakeLists.txt
new file mode 100644
index 0000000000..560cddece9
--- /dev/null
+++ b/pandatool/src/pstatserver/CMakeLists.txt
@@ -0,0 +1,26 @@
+if(HAVE_NET)
+  set(P3PSTATSERVER_HEADERS
+      pStatClientData.h pStatGraph.I
+      pStatGraph.h pStatListener.h pStatMonitor.I
+      pStatMonitor.h pStatPianoRoll.I
+      pStatPianoRoll.h pStatReader.h
+      pStatServer.h pStatStripChart.I
+      pStatStripChart.h pStatThreadData.I
+      pStatThreadData.h pStatView.I pStatView.h
+      pStatViewLevel.I pStatViewLevel.h)
+
+  set(P3PSTATSERVER_SOURCES
+      pStatClientData.cxx pStatGraph.cxx
+      pStatListener.cxx
+      pStatMonitor.cxx pStatPianoRoll.cxx
+      pStatReader.cxx pStatServer.cxx
+      pStatStripChart.cxx pStatThreadData.cxx
+      pStatView.cxx pStatViewLevel.cxx)
+
+  composite_sources(p3pstatserver P3PSTATSERVER_SOURCES)
+  add_library(p3pstatserver STATIC ${P3PSTATSERVER_HEADERS} ${P3PSTATSERVER_SOURCES})
+  target_link_libraries(p3pstatserver p3pandatoolbase p3pstatclient p3linmath)
+
+  # This is only needed for binaries in the pandatool package. It is not useful
+  # for user applications, so it is not installed.
+endif()