diff --git a/source/Makefile b/source/Makefile
index e163ceb023c..7f972a05456 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -106,10 +106,12 @@ ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
     COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
-    COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
-    COMLIB += $(NAN_ODE)/lib/libode.a
-#    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
-    COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
+    COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
+    COMLIB += $(NAN_SOLID)/lib/libsolid.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/fuzzics/$(DEBUG_DIR)libfuzzics.a
+    COMLIB += $(NAN_QHULL)/lib/libqhull.a
+   COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
 #    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
diff --git a/source/nan_compile.mk b/source/nan_compile.mk
index 7b0770a15c8..46128db3b3b 100644
--- a/source/nan_compile.mk
+++ b/source/nan_compile.mk
@@ -38,7 +38,9 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
 # common parts ---------------------------------------------------
 
 # Uncomment next line to enable integrated game engine
-#CFLAGS += -DGAMEBLENDER=1
+CFLAGS  += -DGAMEBLENDER=1
+CFLAGS  += -DUSE_SUMO_SOLID
+CCFLAGS += -DUSE_SUMO_SOLID
 
 ifdef NAN_DEBUG
     CFLAGS += $(NAN_DEBUG)
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 9d648c6d78a..aa6dbadf983 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -58,7 +58,13 @@ all debug::
     # Object Config_Guess DIRectory
     export OCGDIR = $(NAN_OBJDIR)/$(CONFIG_GUESS)
     export NAN_MOTO ?= $(LCGDIR)/moto
-    export NAN_SOLID ?= $(SRCHOME)/sumo/SOLID-3.0
+ifeq ($(FREE_WINDOWS), true)
+    export NAN_SOLID ?= $(LCGDIR)/gcc/solid
+    export NAN_QHULL ?= $(LCGDIR)/gcc/qhull
+else
+    export NAN_SOLID ?= $(LCGDIR)/solid
+    export NAN_QHULL ?= $(LCGDIR)/qhull
+endif
     export NAN_SUMO ?= $(SRCHOME)/gameengine/Physics/Sumo
     export NAN_FUZZICS ?= $(SRCHOME)/gameengine/Physics/Sumo/Fuzzics
     export NAN_BLENKEY ?= $(LCGDIR)/blenkey