--- ./src/if_python.c	2013-02-21 15:31:24.901839791 +0100
+++ ./src/if_python.c	2013-02-21 15:36:32.938839246 +0100
@@ -631,6 +631,7 @@
 static void PythonIO_Flush(void);
 static int PythonIO_Init(void);
 static int PythonMod_Init(void);
+static void Python_FixPath(void);
 
 /* Utility functions for the vim/python interface
  * ----------------------------------------------
@@ -766,6 +767,11 @@
 	 * the current directory in sys.path. */
 	PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
 
+    /* Remove empty elements from sys.path since that causes the PWD to be
+     * used for imports, possibly masking system libraries and/or running
+     * arbitrary code. */
+    Python_FixPath();
+
 	/* lock is created and acquired in PyEval_InitThreads() and thread
 	 * state is created in Py_Initialize()
 	 * there _PyGILState_NoteThreadState() also sets gilcounter to 1
@@ -1598,6 +1604,28 @@
     return 0;
 }
 
+    static void
+Python_FixPath(void)
+{
+	PyObject *sys = PyImport_ImportModule("sys");
+	PyObject *sysdict = PyModule_GetDict(sys);
+	PyObject *path = PyDict_GetItemString(sysdict, "path");
+	PyObject *newpath = PyList_New(0);
+	if (newpath != NULL) {
+	    Py_INCREF(newpath);
+	    PyInt n = PyList_Size(path);
+	    PyInt i;
+	    for (i = 0; i < n; i++) {
+		PyObject *item = PyList_GetItem(path, i);
+		if (strlen(PyString_AsString(item)) != 0) {
+		    PyList_Append(newpath, PyList_GetItem(path, i));
+		}
+	    }
+	    PyDict_SetItemString(sysdict, "path", newpath);
+	    Py_DECREF(newpath);
+	}
+}
+
 /*************************************************************************
  * 4. Utility functions for handling the interface between Vim and Python.
  */