diff --git a/direct/src/directscripts/runPythonEmacs b/direct/src/directscripts/runPythonEmacs
index 5b92855b16..5ce8e3d45b 100755
--- a/direct/src/directscripts/runPythonEmacs
+++ b/direct/src/directscripts/runPythonEmacs
@@ -40,6 +40,11 @@ if [ "$TOONTOWN" ]; then
     TOONTOWN=`cygpath -w $TOONTOWN`
     export TOONTOWN
 fi
+if [ "$PIRATES" ]; then
+    if [ "$debug" ]; then echo "PIRATES  $PIRATES"; fi
+    PIRATES=`cygpath -w $PIRATES`
+    export PIRATES
+fi
 if [ "$TOONTAG" ]; then
     if [ "$debug" ]; then echo "TOONTAG   $TOONTAG"; fi
     TOONTAG=`cygpath -w $TOONTAG`
@@ -109,6 +114,13 @@ if [ "$TTMODELS" ]; then
     export TTMODELS
 fi
 
+# Pirates models
+if [ "$PMODELS" ]; then
+    if [ "$debug" ]; then echo "PMODELS  $PMODELS"; fi
+    PMODELS=`cygpath -w $PMODELS`
+    export PMODELS
+fi
+
 if [ "$BARMODELS" ]; then
     if [ "$debug" ]; then echo "BARMODELS $BARMODELS"; fi
     BARMODELS=`cygpath -w $BARMODELS`
diff --git a/direct/src/ffi/genPyCode b/direct/src/ffi/genPyCode
index 0e88bc5df5..9dd887f995 100755
--- a/direct/src/ffi/genPyCode
+++ b/direct/src/ffi/genPyCode
@@ -5,6 +5,7 @@
 # usage: genPyCode [opts] [linux|win-debug|win-release|win-publish|install|release] [other libs]
 
 # -t adds libtoontown
+# -p adds libpirates
 # -v adds libvrpn
 # -e adds libpandaegg
 # -n doesn't perform a squeeze
@@ -16,9 +17,10 @@ optimizeFlag=""
 ppython=ppython
 ppythonOptimizeFlag=""
 
-while getopts tven flag; do
+while getopts tpven flag; do
   case $flag in
     t) extra_genPyCode_libs="$extra_genPyCode_libs libtoontown" ;;
+    p) extra_genPyCode_libs="$extra_genPyCode_libs libpirates" ;;
     v) extra_genPyCode_libs="$extra_genPyCode_libs libvrpn" ;;
     e) extra_genPyCode_libs="$extra_genPyCode_libs libpandaegg" ;;
     n) fSqueeze="" ;;
diff --git a/direct/src/showbase/ppython b/direct/src/showbase/ppython
index 9ce361c772..f4dcbeef20 100755
--- a/direct/src/showbase/ppython
+++ b/direct/src/showbase/ppython
@@ -49,6 +49,10 @@ if [ "$TOONTOWN" ]; then
     TOONTOWN=`cygpath -w $TOONTOWN`
     export TOONTOWN
 fi
+if [ "$PIRATES" ]; then
+    PIRATES=`cygpath -w $PIRATES`
+    export PIRATES
+fi
 if [ "$BARTOP" ]; then
     BARTOP=`cygpath -w $BARTOP`
     export BARTOP
@@ -77,6 +81,11 @@ if [ "$TTMODELS" ]; then
     TTMODELS=`cygpath -w $TTMODELS`
     export TTMODELS
 fi
+# Pirates models
+if [ "$PMODELS" ]; then
+    PMODELS=`cygpath -w $PMODELS`
+    export PMODELS
+fi
 
 # Export the proper home environment variable
 HOME=`cygpath -w "$HOME"`