diff --git a/direct/src/p3d/coreapi.pdef b/direct/src/p3d/coreapi.pdef
index 9468439742..c4e6e1d5bf 100644
--- a/direct/src/p3d/coreapi.pdef
+++ b/direct/src/p3d/coreapi.pdef
@@ -97,3 +97,11 @@ class p3dcert(package):
     else:
         # Anywhere else, we just ship the executable file p3dcert.exe.
         file('p3dcert.exe')
+
+
+class p3dembed(solo):
+    # This contains the p3dembed executable, that is used by
+    # pdeploy to generate a self-extracting .p3d executable.
+
+    config(platform_specific = True)
+    file('p3dembed.exe')
diff --git a/direct/src/p3d/panda3d.pdef b/direct/src/p3d/panda3d.pdef
index 5ca74cd452..d964f4dc48 100755
--- a/direct/src/p3d/panda3d.pdef
+++ b/direct/src/p3d/panda3d.pdef
@@ -126,7 +126,7 @@ class morepy(package):
            'glob', 'fnmatch', 'linecache', 'shutil', 'dircache',
            'macpath', 'pickle', 'cPickle', 'copy_reg', 'shelve',
            'marshal', 'anydbm', 'whichdb', 'dbm', 'gdbm', 'dbhash',
-           'bsddb', 'dumbdbm', 'sqlite3', 'zlib', 'gzip', 'bz2',
+           'bsddb', 'dumbdbm', 'zlib', 'gzip', 'bz2',
            'zipfile', 'tarfile', 'csv', 'ConfigParser', 'robotparser',
            'netrc', 'xdrlib', 'plistlib', 'hashlib', 'hmac', 'md5',
            'sha', 'os', 'io', 'time', 'optparse', 'getopt', 'logging')
@@ -262,28 +262,11 @@ class vision(package):
     # functionality, it is provided as separate package to save
     # on package download size.
 
-    config(display_name = "Panda3D Vision modules")
+    config(display_name = "Panda3D vision modules")
     require('panda3d')
 
     file('libp3vision.dll')
 
-class wx(package):
-    config(display_name = "wxPython GUI Toolkit")
-    config(gui_app = True)
-    require('panda3d')
-
-    module('direct.showbase.WxGlobal', 'wx', 'wx.*')
-
-
-class tk(package):
-    config(display_name = "Tk GUI Toolkit")
-    config(gui_app = True)
-    require('panda3d')
-
-    module('Tkinter',
-           'direct.showbase.TkGlobal',
-           'direct.tkpanels',
-           'direct.tkwidgets')
 
 class packp3d(p3d):
     # This application is a command-line convenience for building a p3d
diff --git a/direct/src/p3d/thirdparty.pdef b/direct/src/p3d/thirdparty.pdef
new file mode 100644
index 0000000000..0fc4d207c8
--- /dev/null
+++ b/direct/src/p3d/thirdparty.pdef
@@ -0,0 +1,85 @@
+# This file defines a number of standard "packages" that correspond to
+# a Panda3D distribution.  These packages are built by passing this
+# file to the ppackage utility, either as a packaged application, or
+# as the module direct.p3d.ppackage.
+
+# The packages in this file define the thirdparty
+# packages that could be used by a .p3d archive.
+
+# When needed, these packages are downloaded by the core API, from the
+# host URL specified in a given p3d file, and not from any hardcoded
+# URL.  Thus, any custom version of Panda3D may be hosted on any
+# server in the world, and any version of the plugin can download it.
+
+# Also see panda3d.pdef.
+
+class wx(package):
+    config(display_name = "wxPython GUI Toolkit")
+    config(gui_app = True)
+    require('panda3d')
+
+    module('direct.showbase.WxGlobal', 'wx', 'wx.*')
+
+class tk(package):
+    config(display_name = "Tk GUI Toolkit")
+    config(gui_app = True)
+    require('panda3d')
+
+    module('Tkinter',
+           'direct.showbase.TkGlobal',
+           'direct.tkpanels',
+           'direct.tkwidgets')
+
+class sqlite(package):
+    config(display_name = "SQLite Interface")
+    require('panda3d')
+
+    module('sqlite', 'sqlite3')
+
+class numpy(package):
+    config(display_name = "NumPy")
+    require('panda3d')
+
+    module('numpy')
+
+class pygame(package):
+    config(display_name = "PyGame")
+    require('panda3d', 'numpy')
+
+    module('pygame')
+
+class twisted(package):
+    config(display_name = "Twisted")
+    require('panda3d')
+
+    module('twisted', 'twisted.*')
+
+class pil(package):
+    config(display_name = "Python Imaging Library")
+    require('panda3d')
+
+    module('PIL', 'PIL.*')
+
+class pyopengl(package):
+    config(display_name = "PyOpenGL")
+    require('panda3d', 'numpy')
+
+    module('OpenGL', 'OpenGL.*')
+
+class pyopencl(package):
+    config(display_name = "PyOpenCL")
+    require('panda3d', 'numpy')
+
+    module('pyopencl')
+
+class httplib2(package):
+    config(display_name = "httplib2")
+    require('panda3d')
+
+    module('httplib2')
+
+class pycurl(package):
+    config(display_name = "PyCURL")
+    require('panda3d')
+
+    module('pycurl')