diff --git a/doc/makepanda/makepanda.py b/doc/makepanda/makepanda.py
index 62f655492e..739186e669 100755
--- a/doc/makepanda/makepanda.py
+++ b/doc/makepanda/makepanda.py
@@ -4460,7 +4460,7 @@ if (OMIT.count("FREETYPE")==0) and (OMIT.count("PANDAAPP")==0):
 
 
 #
-# Generate the models directory
+# Generate the models directory and samples directory
 #
 
 if (OMIT.count("PANDATOOL")==0):
@@ -4469,6 +4469,14 @@ if (OMIT.count("PANDATOOL")==0):
     CompileAllModels("built/models/gui/",  "dmodels/src/gui/")
     CompileAllModels("built/models/",      "models/")
 
+    if (os.path.isdir("samples")):
+        for tut in os.listdir("samples"):
+            dir = "samples/"+tut+"/models/"
+            if (os.path.isdir(dir)):
+                for eggpz in GetDirectoryContents(dir, ["*.egg.pz"]):
+                    bampz = os.path.basename(eggpz[:-7] + ".bam.pz")
+                    EnqueueBamPZ("-ps keep", dir + bampz, dir + eggpz)
+
     CopyAllFiles("built/models/audio/sfx/",  "dmodels/src/audio/sfx/", ".wav")
     CopyAllFiles("built/models/icons/",      "dmodels/src/icons/",     ".gif")