diff --git a/lldb/scripts/Python/edit-swig-python-wrapper-file.py b/lldb/scripts/Python/edit-swig-python-wrapper-file.py
index e0efb49f1a7c..d64c0b408164 100644
--- a/lldb/scripts/Python/edit-swig-python-wrapper-file.py
+++ b/lldb/scripts/Python/edit-swig-python-wrapper-file.py
@@ -20,7 +20,7 @@
 # That's what this python script does.
 #
 
-import os
+import os, sys
 
 include_python = '#include <Python.h>'
 include_python_ifdef = '''#if defined (__APPLE__)
@@ -30,8 +30,12 @@ include_python_ifdef = '''#if defined (__APPLE__)
 #endif
 '''
 
-input_dir_name = os.environ["SRCROOT"]
-full_input_name = input_dir_name + "/source/LLDBWrapPython.cpp"
+if len (sys.argv) > 1:
+    input_dir_name = sys.argv[1]
+    full_input_name = input_dir_name + "/LLDBWrapPython.cpp"
+else:
+    input_dir_name = os.environ["SRCROOT"]
+    full_input_name = input_dir_name + "/source/LLDBWrapPython.cpp"
 full_output_name = full_input_name + ".edited"
 
 with open(full_input_name, 'r') as f_in:
diff --git a/lldb/source/Interpreter/Makefile b/lldb/source/Interpreter/Makefile
index 9bd75558206a..0f1e5c1eb410 100644
--- a/lldb/source/Interpreter/Makefile
+++ b/lldb/source/Interpreter/Makefile
@@ -34,9 +34,16 @@ LLDB_SWIG_INCLUDE_DIRS += -I"/usr/include"
 
 LLDBWrapPython.cpp:
 	$(Echo) Generating LLDBWrapPython.cpp
-	$(Verb) swig -c++ -classic -shadow -python $(LLDB_SWIG_INCLUDE_DIRS) \
+	$(Verb) swig -c++ -shadow -python $(LLDB_SWIG_INCLUDE_DIRS) \
           -D__STDC_LIMIT_MACROS -outdir "$(LLDB_BIN_DIR)"   \
           -o LLDBWrapPython.cpp "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/lldb.swig"
+	$(Verb) python "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/Python/modify-python-lldb.py" \
+		  "$(LLDB_BIN_DIR)"
+	$(Verb) python "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/Python/edit-swig-python-wrapper-file.py" \
+		  "$(PROJ_OBJ_DIR)"
+	$(Verb) if test -f "$(PROJ_OBJ_DIR)/LLDBWrapPython.cpp.edited"; then \
+		  mv "$(PROJ_OBJ_DIR)/LLDBWrapPython.cpp.edited" \
+			 "$(PROJ_OBJ_DIR)/LLDBWrapPython.cpp"; fi
 	$(Verb) cp "$(PROJ_SRC_DIR)/embedded_interpreter.py" "$(PYTHON_DIR)"
 
 install-local:: $(PYTHON_DIR)/lldb.py $(PYTHON_DIR)/embedded_interpreter.py $(LIBLLDB)