diff --git a/dtool/Config.pp b/dtool/Config.pp
index f5b5122372..1f17db8522 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -307,14 +307,16 @@
 #define MIKMOD_CONFIG libmikmod-config
 #defer HAVE_MIKMOD $[bintest $[MIKMOD_CONFIG]]
 
-// Do you want to build in support for threading (inter-process
-// control)?  What additional libraries are required?  Currently, this
-// requires NSPR to compile correctly.
-#define IPC_IPATH
-#define IPC_LPATH
-#define IPC_LIBS
-//#defer HAVE_IPC $[HAVE_NSPR]
-#define HAVE_IPC
+// Do you want to build in support for threading (multiprocessing)?
+// Building in support for threading will enable Panda to take
+// advantage of multiple CPU's if you have them (and if the OS
+// supports kernel threads running on different CPU's), but it will
+// slightly slow down Panda for the single CPU case, so this is not
+// enabled by default.
+
+// Currently, threading support requires NSPR, so you should not
+// define this true unless you have NSPR installed.
+#define HAVE_THREADS
 
 // Do you want to build the network interface?  What additional libraries
 // are required?  Currently, this requires NSPR.
diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp
index 1a050655e6..40f26c887e 100644
--- a/dtool/LocalSetup.pp
+++ b/dtool/LocalSetup.pp
@@ -85,8 +85,8 @@ $[cdefine HAVE_SOXST]
 /* Define if we want to use mikmod for audio.  */
 $[cdefine HAVE_MIKMOD]
 
-/* Define if we want to compile the ipc code.  */
-$[cdefine HAVE_IPC]
+/* Define if we want to compile the threading code.  */
+$[cdefine HAVE_THREADS]
 
 /* Define if we want to compile the net code.  */
 $[cdefine HAVE_NET]
diff --git a/dtool/Package.pp b/dtool/Package.pp
index c7c65ea7cb..2890031639 100644
--- a/dtool/Package.pp
+++ b/dtool/Package.pp
@@ -165,10 +165,7 @@
 #set MIKMOD_CONFIG $[MIKMOD_CONFIG]
 #set HAVE_MIKMOD $[HAVE_MIKMOD]
 
-#set IPC_IPATH $[unixfilename $[IPC_IPATH]]
-#set IPC_LPATH $[unixfilename $[IPC_LPATH]]
-#set IPC_LIBS $[IPC_LIBS]
-#set HAVE_IPC $[HAVE_IPC]
+#set HAVE_THREADS $[HAVE_THREADS]
 
 #set NET_IPATH $[unixfilename $[NET_IPATH]]
 #set NET_LPATH $[unixfilename $[NET_LPATH]]
diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index 8b4e084b15..37d3c6fc0d 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -217,12 +217,6 @@
   #define maya_libs $[MAYA_LIBS]
 #endif
 
-#if $[HAVE_IPC]
-  #define ipc_ipath $[wildcard $[IPC_IPATH]]
-  #define ipc_lpath $[wildcard $[IPC_LPATH]]
-  #define ipc_libs $[IPC_LIBS]
-#endif
-
 #if $[HAVE_NET]
   #define net_ipath $[wildcard $[NET_IPATH]]
   #define net_lpath $[wildcard $[NET_LPATH]]