diff --git a/contrib/upython b/contrib/upython
new file mode 100755
index 00000000..1ae147b4
--- /dev/null
+++ b/contrib/upython
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+COMMAND=./uwsgi
+CONFIG_FILE=
+
+
+FIRST=0
+
+for ARG in $@;do
+  if [ $FIRST -eq 0 ];then
+    FIRST=1
+  else
+    ARGS="$ARGS $ARG"
+  fi
+done
+
+export UWSGI_INHERIT=CONFIG_FILE
+export UWSGI_PYRUN=$1
+export UWSGI_PYARGV=$ARGS
+
+exec $COMMAND
diff --git a/plugins/python/pyutils.c b/plugins/python/pyutils.c
index c02fa48d..40a7bb45 100644
--- a/plugins/python/pyutils.c
+++ b/plugins/python/pyutils.c
@@ -64,11 +64,17 @@ void init_pyargv() {
 
 	char *ap;
 
+	char *argv0 = "uwsgi";
+
+	if (up.pyrun) {
+		argv0 = up.pyrun;
+	}
+
 #ifdef PYTHREE
-	wchar_t pname[6];
-	mbstowcs(pname, "uwsgi", 6);
+	wchar_t *pname = uwsgi_calloc(strlen(argv0)+1);
+	mbstowcs(pname, argv0, strlen(argv0)+1);
 #else
-	char *pname = "uwsgi";
+	char *pname = argv0;
 #endif
 
 	up.argc = 1;