diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt
index a32bb8270..515eba4db 100644
--- a/src/BulletDynamics/CMakeLists.txt
+++ b/src/BulletDynamics/CMakeLists.txt
@@ -46,18 +46,4 @@ ADD_LIBRARY(LibBulletDynamics
 	Vehicle/btRaycastVehicle.h
 	Vehicle/btWheelInfo.cpp
 	Vehicle/btWheelInfo.h
-	SoftBody/btSoftBody.cpp
-	SoftBody/btSoftBody.h
-	SoftBody/btSoftBodyHelpers.cpp
-	SoftBody/btSparseSDF.h
-	SoftBody/btDbvt.cpp  
-	SoftBody/btDbvt.h
-	SoftBody/btSoftBodyHelpers.h
-	SoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
-	SoftBody/btSoftRigidCollisionAlgorithm.cpp
-	SoftBody/btSoftRigidCollisionAlgorithm.h
-	SoftBody/btSoftSoftCollisionAlgorithm.cpp
-	SoftBody/btSoftSoftCollisionAlgorithm.h
-	SoftBody/btSoftRigidDynamicsWorld.h
-	SoftBody/btSoftRigidDynamicsWorld.cpp
 )
diff --git a/src/BulletDynamics/Jamfile b/src/BulletDynamics/Jamfile
index 11f7ba7f5..10ea43b79 100644
--- a/src/BulletDynamics/Jamfile
+++ b/src/BulletDynamics/Jamfile
@@ -3,7 +3,6 @@ SubDir TOP src BulletDynamics ;
 Description bulletdynamics : "Bullet Rigidbody Dynamics" ;
 Library bulletdynamics : 
   [ Wildcard ConstraintSolver : *.h *.cpp ] 
-  [ Wildcard SoftBody : *.h *.cpp ]
   [ Wildcard Dynamics : *.h *.cpp ] 
   [ Wildcard Vehicle : *.h *.cpp ] 
 ;
diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt
new file mode 100644
index 000000000..05c927452
--- /dev/null
+++ b/src/BulletSoftBody/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+INCLUDE_DIRECTORIES(
+${BULLET_PHYSICS_SOURCE_DIR}/src }
+)
+
+ADD_LIBRARY(LibBulletSoftBody
+	btSoftBody.cpp
+	btSoftBody.h
+	btSoftBodyHelpers.cpp
+	btSparseSDF.h
+	btDbvt.cpp  
+	btDbvt.h
+	btSoftBodyHelpers.h
+	btSoftBodyRigidBodyCollisionConfiguration.cpp
+	btSoftRigidCollisionAlgorithm.cpp
+	btSoftRigidCollisionAlgorithm.h
+	btSoftSoftCollisionAlgorithm.cpp
+	btSoftSoftCollisionAlgorithm.h
+	btSoftRigidDynamicsWorld.h
+	btSoftRigidDynamicsWorld.cpp
+)
diff --git a/src/BulletSoftBody/Jamfile b/src/BulletSoftBody/Jamfile
new file mode 100644
index 000000000..915ac4b17
--- /dev/null
+++ b/src/BulletSoftBody/Jamfile
@@ -0,0 +1,8 @@
+SubDir TOP src BulletSoftBody ;
+
+Description bulletsoftbody : "Bullet Softbody Dynamics" ;
+Library bulletsoftbody : 
+  [ Wildcard *.h *.cpp ]
+;
+
+LibDepends bulletsoftbody : bulletdynamics bulletcollision  ;
diff --git a/src/BulletDynamics/SoftBody/btDbvt.cpp b/src/BulletSoftBody/btDbvt.cpp
similarity index 100%
rename from src/BulletDynamics/SoftBody/btDbvt.cpp
rename to src/BulletSoftBody/btDbvt.cpp
diff --git a/src/BulletDynamics/SoftBody/btDbvt.h b/src/BulletSoftBody/btDbvt.h
similarity index 100%
rename from src/BulletDynamics/SoftBody/btDbvt.h
rename to src/BulletSoftBody/btDbvt.h
diff --git a/src/BulletDynamics/SoftBody/btSoftBody.cpp b/src/BulletSoftBody/btSoftBody.cpp
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftBody.cpp
rename to src/BulletSoftBody/btSoftBody.cpp
diff --git a/src/BulletDynamics/SoftBody/btSoftBody.h b/src/BulletSoftBody/btSoftBody.h
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftBody.h
rename to src/BulletSoftBody/btSoftBody.h
diff --git a/src/BulletDynamics/SoftBody/btSoftBodyHelpers.cpp b/src/BulletSoftBody/btSoftBodyHelpers.cpp
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftBodyHelpers.cpp
rename to src/BulletSoftBody/btSoftBodyHelpers.cpp
diff --git a/src/BulletDynamics/SoftBody/btSoftBodyHelpers.h b/src/BulletSoftBody/btSoftBodyHelpers.h
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftBodyHelpers.h
rename to src/BulletSoftBody/btSoftBodyHelpers.h
diff --git a/src/BulletDynamics/SoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp b/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
rename to src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
diff --git a/src/BulletDynamics/SoftBody/btSoftBodyRigidBodyCollisionConfiguration.h b/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
rename to src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
diff --git a/src/BulletDynamics/SoftBody/btSoftRigidCollisionAlgorithm.cpp b/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftRigidCollisionAlgorithm.cpp
rename to src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
diff --git a/src/BulletDynamics/SoftBody/btSoftRigidCollisionAlgorithm.h b/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftRigidCollisionAlgorithm.h
rename to src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
diff --git a/src/BulletDynamics/SoftBody/btSoftRigidDynamicsWorld.cpp b/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftRigidDynamicsWorld.cpp
rename to src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
diff --git a/src/BulletDynamics/SoftBody/btSoftRigidDynamicsWorld.h b/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftRigidDynamicsWorld.h
rename to src/BulletSoftBody/btSoftRigidDynamicsWorld.h
diff --git a/src/BulletDynamics/SoftBody/btSoftSoftCollisionAlgorithm.cpp b/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftSoftCollisionAlgorithm.cpp
rename to src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
diff --git a/src/BulletDynamics/SoftBody/btSoftSoftCollisionAlgorithm.h b/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSoftSoftCollisionAlgorithm.h
rename to src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
diff --git a/src/BulletDynamics/SoftBody/btSparseSDF.h b/src/BulletSoftBody/btSparseSDF.h
similarity index 100%
rename from src/BulletDynamics/SoftBody/btSparseSDF.h
rename to src/BulletSoftBody/btSparseSDF.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ae1a7ab6..1470d6d48 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1 +1 @@
-SUBDIRS( BulletCollision BulletDynamics LinearMath )
+SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath )
diff --git a/src/Jamfile b/src/Jamfile
index 60e3112f3..c80617ae5 100644
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -1,5 +1,6 @@
 SubDir TOP src ;
 
+SubInclude TOP src BulletSoftBody ;
 SubInclude TOP src BulletCollision ;
 SubInclude TOP src BulletDynamics ;
 SubInclude TOP src LinearMath ;