diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 6a766f34120..2a888706602 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -43,3 +43,11 @@ void py_load_samba_modules(void)
 		PyImport_ExtendInittab(&py_modules[i]);
 	}
 }
+
+void py_update_path(const char *bindir)
+{
+	char *newpath;
+	asprintf(&newpath, "%s:%s/python:%s/../scripting/python", Py_GetPath(), bindir, bindir);
+	PySys_SetPath(newpath);
+	free(newpath);
+}
diff --git a/source4/scripting/python/smbpython.c b/source4/scripting/python/smbpython.c
index 19c458e7acb..27286236ef0 100644
--- a/source4/scripting/python/smbpython.c
+++ b/source4/scripting/python/smbpython.c
@@ -21,9 +21,16 @@
 #include <Python.h>
 
 void py_load_samba_modules(void);
+void py_update_path(const char *bindir);
 
 int main(int argc, char **argv) 
 {
 	py_load_samba_modules();
+	Py_Initialize();
+	if (strchr(argv[0], '/') != NULL) {
+		char *bindir = strndup(argv[0], strrchr(argv[0], '/')-argv[0]);
+		py_update_path(bindir);
+		free(bindir);
+	}
 	return Py_Main(argc,argv);
 }