diff --git a/direct/src/configfiles/Sources.pp b/direct/src/configfiles/Sources.pp
index 6131857db6..49509a6afe 100644
--- a/direct/src/configfiles/Sources.pp
+++ b/direct/src/configfiles/Sources.pp
@@ -1,5 +1,5 @@
 #define INSTALL_CONFIG \
-  _70_direct.prc
+  70_direct.prc
 
 #if $[CTPROJS]
   // These files only matter to ctattach users.
diff --git a/direct/src/configfiles/_direct.prc.pp b/direct/src/configfiles/_direct.prc.pp
index 615a596bd7..972143ae16 100644
--- a/direct/src/configfiles/_direct.prc.pp
+++ b/direct/src/configfiles/_direct.prc.pp
@@ -6,7 +6,7 @@
 // parameters, in particular the default display types.
 //
 
-#output _70_direct.prc
+#output 70_direct.prc
 #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE].
 ################################# DO NOT EDIT ###########################
 
@@ -21,4 +21,4 @@ egg-object-type-direct-widget   <Scalar> collide-mask { 0x80000000 } <Collide> {
 
 cull-bin gui-popup 60 unsorted
 
-#end _70_direct.prc
+#end 70_direct.prc
diff --git a/panda/src/configfiles/Sources.pp b/panda/src/configfiles/Sources.pp
index ee80aa9164..cf3d7a21d8 100644
--- a/panda/src/configfiles/Sources.pp
+++ b/panda/src/configfiles/Sources.pp
@@ -1,6 +1,6 @@
 
 #define INSTALL_CONFIG \
-  panda.emacs panda.emacs.Xdefaults _80_panda.prc
+  panda.emacs panda.emacs.Xdefaults 80_panda.prc
 
 
 #if $[CTPROJS]
diff --git a/panda/src/configfiles/_panda.prc.pp b/panda/src/configfiles/_panda.prc.pp
index d9f5673576..0e8bb22137 100644
--- a/panda/src/configfiles/_panda.prc.pp
+++ b/panda/src/configfiles/_panda.prc.pp
@@ -6,7 +6,7 @@
 // parameters, in particular the default display types.
 //
 
-#output _80_panda.prc
+#output 80_panda.prc
 #### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE].
 ################################# DO NOT EDIT ###########################
 
@@ -57,4 +57,4 @@ load-file-type egg pandaegg
 egg-object-type-portal          <Scalar> portal { 1 }
 egg-object-type-polylight       <Scalar> polylight { 1 }
 
-#end _80_panda.prc
+#end 80_panda.prc
diff --git a/pandatool/src/configfiles/Sources.pp b/pandatool/src/configfiles/Sources.pp
index 894e1bfdd3..42f2901c27 100644
--- a/pandatool/src/configfiles/Sources.pp
+++ b/pandatool/src/configfiles/Sources.pp
@@ -1,8 +1,11 @@
 
 #define INSTALL_CONFIG \
-  _pandatool.prc
+  72_pandatool.prc
 
 #if $[CTPROJS]
   // These files only matter to ctattach users.
   #define INSTALL_CONFIG $[INSTALL_CONFIG] pandatool.init
 #endif
+
+ 
+#include $[THISDIRPREFIX]_pandatool.prc.pp
diff --git a/pandatool/src/configfiles/_pandatool.prc b/pandatool/src/configfiles/_pandatool.prc
deleted file mode 100644
index 720967f68e..0000000000
--- a/pandatool/src/configfiles/_pandatool.prc
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Since we have compiled pandatool, it follows that the ptloader
-# module is available.  Request that it be loaded.  This module allows
-# direct loading of third-party model files like .flt, .mb, or .dxf
-# into Panda, for instance via the loadModel() call or on the pview
-# command line.
-
-load-file-type ptloader
diff --git a/pandatool/src/configfiles/_pandatool.prc.pp b/pandatool/src/configfiles/_pandatool.prc.pp
new file mode 100644
index 0000000000..be13d70497
--- /dev/null
+++ b/pandatool/src/configfiles/_pandatool.prc.pp
@@ -0,0 +1,21 @@
+//
+// _pandatool.prc.pp
+//
+// This file defines the script to auto-generate _pandatool.prc at
+// ppremake time.
+//
+
+#output 72_pandatool.prc
+#### Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE].
+################################# DO NOT EDIT ###########################
+
+
+# Since we have compiled pandatool, it follows that the ptloader
+# module is available.  Request that it be loaded.  This module allows
+# direct loading of third-party model files like .flt, .mb, or .dxf
+# into Panda, for instance via the loadModel() call or on the pview
+# command line.
+
+load-file-type ptloader
+
+#end 72_pandatool.prc