diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 37491505..806bef9c 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -27,5 +27,8 @@ import sys
 sys.stdout.write('fpdb.py has been renamed to fpdb.pyw - now calling fpdb.pyw ...\n\n')
 sys.stdout.flush()
 
-os.execvpe('pythonw.exe', ('pythonw.exe', 'fpdb.pyw', '-r'), os.environ) 
+if os.name=='nt':
+    os.execvpe('pythonw.exe', list(('pythonw.exe', 'fpdb.pyw', '-r'))+sys.argv[1:], os.environ) 
+else:
+    os.execvpe('python', list(('python', 'fpdb.pyw', '-r'))+sys.argv[1:], os.environ) 
 # first arg is ignored (name of program being run)
diff --git a/run_fpdb.py b/run_fpdb.py
index e77d789f..06581b9e 100755
--- a/run_fpdb.py
+++ b/run_fpdb.py
@@ -15,7 +15,6 @@
 #In the "official" distribution you can find the license in
 #agpl-3.0.txt in the docs folder of the package.
 
-
 import os
 import sys
 
@@ -25,6 +24,8 @@ sys.path[0] = sys.path[0]+os.sep+"pyfpdb"
 os.chdir(sys.path[0])
 #print "sys.path[0] =", sys.path[0], "cwd =", os.getcwd()
 
-
-os.execvpe('pythonw.exe', ('pythonw.exe', 'fpdb.pyw', '-r'), os.environ) 
+if os.name=='nt':
+    os.execvpe('pythonw.exe', list(('pythonw.exe', 'fpdb.pyw', '-r'))+sys.argv[1:], os.environ) 
+else:
+    os.execvpe('python', list(('python', 'fpdb.pyw', '-r'))+sys.argv[1:], os.environ) 
 # first arg is ignored (name of program being run)