diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt
index 093833fa8b..93d61fdd74 100644
--- a/panda/CMakeLists.txt
+++ b/panda/CMakeLists.txt
@@ -30,6 +30,7 @@ add_subdirectory(src/event)
 add_subdirectory(src/mathutil)
 add_subdirectory(src/gsgbase)
 add_subdirectory(src/pnmimage)
+add_subdirectory(src/pnmimagetypes)
 add_subdirectory(src/gobj)
 add_subdirectory(src/pgraph)
 add_subdirectory(src/pgraphnodes)
@@ -48,4 +49,7 @@ add_subdirectory(src/pgui)
 add_subdirectory(src/recorder)
 add_subdirectory(src/collide)
 add_subdirectory(src/framework)
-add_subdirectory(src/testbed)
+#add_subdirectory(src/testbed)
+
+# Include panda metalibs
+#add_subdirectory(metalibs/panda)
diff --git a/panda/src/pnmimagetypes/CMakeLists.txt b/panda/src/pnmimagetypes/CMakeLists.txt
new file mode 100644
index 0000000000..a8d21dc84e
--- /dev/null
+++ b/panda/src/pnmimagetypes/CMakeLists.txt
@@ -0,0 +1,32 @@
+set(P3PNMIMAGETYPES_HEADERS
+  config_pnmimagetypes.h pnmFileTypeBMP.h
+  pnmFileTypeIMG.h
+  pnmFileTypePNG.h
+  pnmFileTypePNM.h
+  pnmFileTypePfm.h
+  pnmFileTypeSGI.h pnmFileTypeSoftImage.h
+  pnmFileTypeTGA.h
+  pnmFileTypeTIFF.h
+  pnmFileTypeJPG.h
+)
+
+set(P3PNMIMAGETYPES_SOURCES
+  config_pnmimagetypes.cxx
+  pnmFileTypeBMPReader.cxx pnmFileTypeBMPWriter.cxx
+  pnmFileTypeBMP.cxx
+  pnmFileTypeIMG.cxx
+  pnmFileTypeJPG.cxx pnmFileTypeJPGReader.cxx pnmFileTypeJPGWriter.cxx
+  pnmFileTypePNG.cxx
+  pnmFileTypePNM.cxx
+  pnmFileTypePfm.cxx
+  pnmFileTypeSGI.cxx
+  pnmFileTypeSGIReader.cxx pnmFileTypeSGIWriter.cxx
+  pnmFileTypeSoftImage.cxx
+  pnmFileTypeTIFF.cxx
+  pnmFileTypeTGA.cxx
+)
+
+composite_sources(p3pnmimagetypes P3PNMIMAGETYPES_SOURCES)
+add_library(p3pnmimagetypes ${P3PNMIMAGETYPES_HEADERS} ${P3PNMIMAGETYPES_SOURCES})
+target_link_libraries(p3pnmimagetypes p3pnmimage)
+target_interrogate(p3pnmimagetypes ALL)