diff --git a/dtool/Config.pp b/dtool/Config.pp
index f9f1d9409e..106c55969e 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -264,6 +264,8 @@
 #define PYTHON_IPATH /usr/include/python2.4
 #define PYTHON_LPATH
 #define PYTHON_FPATH
+#define PYTHON_COMMAND python
+#defer PYTHON_DEBUG_COMMAND $[PYTHON_COMMAND]$[if $[WINDOWS_PLATFORM],_d]
 #define PYTHON_FRAMEWORK
 #defer HAVE_PYTHON $[isdir $[PYTHON_IPATH]]
 
diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index cd58680b3f..b7bc2e85de 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -463,6 +463,8 @@
 #defun get_libs
   #define alt_libs $[if $[IGNORE_LIB_DEFAULTS_HACK],,$[stl_libs] $[nspr_libs] $[python_libs]]
 
+  #define alt_libs $[alt_libs] $[EXTRA_LIBS]
+
   #if $[WINDOWS_PLATFORM]
     #set alt_libs $[alt_libs] $[WIN_SYS_LIBS] $[components $[WIN_SYS_LIBS],$[active_libs] $[transitive_link]]
   #elif $[OSX_PLATFORM]