diff --git a/Makefile b/Makefile
index fb820a5881..d82b65ec0f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ box2d:
 box2d-clean:
 	$(MAKE) -C external/Box2D/proj.$(PLATFORM) clean
 
-libextensions: cocosdenshion chipmunk box2d
+libextensions: chipmunk cocosdenshion  box2d
 	$(MAKE) -C extensions/proj.$(PLATFORM)
 libextensions-clean:
 	$(MAKE) -C extensions/proj.$(PLATFORM) clean
@@ -47,7 +47,7 @@ simplegame: libcocos2dx
 simplegame-clean:
 	$(MAKE) -C samples/Cpp/SimpleGame/proj.$(PLATFORM) clean
 
-all: box2d cocosdenshion libextensions libcocos2dx lua hellocpp testcpp simplegame
+all: chipmunk cocosdenshion libextensions libcocos2dx lua hellocpp testcpp simplegame
 clean: libcocos2dx-clean box2d-clean chipmunk-clean cocosdenshion-clean libextensions-clean lua-clean hellocpp-clean testcpp-clean simplegame-clean
 
 # Haven't yet got the lua projects working with emscripten
diff --git a/cocos2dx/proj.linux/Makefile b/cocos2dx/proj.linux/Makefile
index a1234a9f90..c063e48a34 100644
--- a/cocos2dx/proj.linux/Makefile
+++ b/cocos2dx/proj.linux/Makefile
@@ -1,17 +1,17 @@
 TARGET = libcocos2d.so
 
 INCLUDES += \
-			-I../platform/third_party/linux/libfreetype2 \
-			-I../platform/third_party/common/etc \
-		       -I../platform/third_party/common/s3tc \
-		      -I../platform/third_party/common/atitc \
-			-I../../extensions \
-			-I../../extensions/CCBReader \
-			-I../../extensions/GUI/CCControlExtension \
-			-I../../extensions/GUI/CCControlExtension \
-			-I../../external/chipmunk/include/chipmunk \
-			-I../../extensions/network \
-            -I../../extensions/Components \
+	-I../platform/third_party/linux/libfreetype2 \
+	-I../platform/third_party/common/etc \
+	-I../platform/third_party/common/s3tc \
+        -I../platform/third_party/common/atitc \
+	-I../../extensions \
+	-I../../extensions/CCBReader \
+	-I../../extensions/GUI/CCControlExtension \
+	-I../../extensions/GUI/CCControlExtension \
+	-I../../external/chipmunk/include/chipmunk \
+	-I../../extensions/network \
+        -I../../extensions/Components
 
 SOURCES = ../actions/CCAction.cpp \
 ../actions/CCActionCamera.cpp \
@@ -81,9 +81,19 @@ SOURCES = ../actions/CCAction.cpp \
 ../particle_nodes/CCParticleSystem.cpp \
 ../particle_nodes/CCParticleSystemQuad.cpp \
 ../particle_nodes/CCParticleBatchNode.cpp \
+../physics/Box2D/CCPhysicsContactInfo.cpp \
+../physics/Box2D/CCPhysicsJointInfo.cpp \
+../physics/Box2D/CCPhysicsShapeInfo.cpp \
+../physics/Box2D/CCPhysicsBodyInfo.cpp \
+../physics/Box2D/CCPhysicsWorldInfo.cpp \
+../physics/chipmunk/CCPhysicsContactInfo.cpp \
+../physics/chipmunk/CCPhysicsJointInfo.cpp \
+../physics/chipmunk/CCPhysicsShapeInfo.cpp \
+../physics/chipmunk/CCPhysicsBodyInfo.cpp \
+../physics/chipmunk/CCPhysicsWorldInfo.cpp \
 ../physics/CCPhysicsBody.cpp \
-../physics/CCPhysicsContactDelegate.cpp \
-../physics/CCPhysicsFixture.cpp \
+../physics/CCPhysicsContact.cpp \
+../physics/CCPhysicsShape.cpp \
 ../physics/CCPhysicsJoint.cpp \
 ../physics/CCPhysicsWorld.cpp \
 ../platform/CCSAXParser.cpp \
@@ -167,6 +177,8 @@ include cocos2dx.mk
 CXXFLAGS += -Wno-sequence-point
 CCFLAGS += -Wno-sequence-point
 
+STATICLIBS += $(LIB_DIR)/libchipmunk.a
+
 TARGET := $(LIB_DIR)/$(TARGET)
 
 all: $(TARGET)
diff --git a/cocos2dx/proj.linux/cocos2dx.mk b/cocos2dx/proj.linux/cocos2dx.mk
index 061b5b9a5d..29c1f8f3fd 100644
--- a/cocos2dx/proj.linux/cocos2dx.mk
+++ b/cocos2dx/proj.linux/cocos2dx.mk
@@ -59,8 +59,7 @@ INCLUDES +=  \
     -I$(COCOS_SRC)/platform/linux \
     -I$(COCOS_SRC)/platform/third_party/linux/libjpeg \
     -I$(COCOS_SRC)/platform/third_party/linux/libtiff \
-    -I$(COCOS_SRC)/platform/third_party/linux/libwebp \
-    -I$(COCOS_ROOT/external/chipmunk/include/chipmunk
+    -I$(COCOS_SRC)/platform/third_party/linux/libwebp
 
 LBITS := $(shell getconf LONG_BIT)
 ifeq ($(LBITS),64)