diff --git a/intern/python/freeze/Makefile b/intern/python/freeze/Makefile
index cb364b0cdeb..8318568a4d2 100644
--- a/intern/python/freeze/Makefile
+++ b/intern/python/freeze/Makefile
@@ -2,9 +2,11 @@
 # This is the makefile for the bytecode freezing of all modules which
 # the main file depends on (last argument in importer rule)
 
+include nan_definitions.mk
+
 SRCDIR = ../modules
 
-TARGETDIR = ../../../source/blender/bpython/frozen
+TARGETDIR = $(OCGDIR)/blender/bpython/frozen
 
 PYFLAGS = -S -O
 
@@ -13,7 +15,9 @@ default: importer
 install: importer
 
 importer: 
-	python $(PYFLAGS) freeze.py -d -x os -x pprint -I $(SRCDIR) -o $(TARGETDIR) $(SRCDIR)/VRMLmain.py 
+	@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR)
+	python $(PYFLAGS) freeze.py -d -x os -x pprint -x string -x copy -I $(SRCDIR) -o $(TARGETDIR) $(SRCDIR)/VRMLmain.py 
+	$(MAKE) -C $(TARGETDIR)
 
 clean:
 	rm *.pyo
diff --git a/source/blender/bpython/Makefile b/source/blender/bpython/Makefile
index fad66fbaec5..ef58948bd88 100644
--- a/source/blender/bpython/Makefile
+++ b/source/blender/bpython/Makefile
@@ -32,6 +32,6 @@
 # Bounces make to subdirectories.
 
 SOURCEDIR = source/blender/bpython
-DIRS = intern frozen
+DIRS = intern 
 
 include nan_subdirs.mk
diff --git a/source/blender/bpython/intern/Makefile b/source/blender/bpython/intern/Makefile
index b6c84196f4d..99071110fc0 100644
--- a/source/blender/bpython/intern/Makefile
+++ b/source/blender/bpython/intern/Makefile
@@ -42,7 +42,7 @@ endif
 
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
-CPPFLAGS += -DFUTURE_PYTHON_API  # see api.h for configuration
+CPPFLAGS += -DCURRENT_PYTHON_API  # see api.h for configuration
 #CPPFLAGS += -DNO_RELEASE  # see api.h for configuration
 
 # OpenGL and Python