diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index 44fc2903875..eee51df6377 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -50,6 +50,11 @@ MACRO(SETUP_LIBDIRS)
   IF(WITH_OPENAL)
     LINK_DIRECTORIES(${OPENAL_LIBPATH})
   ENDIF(WITH_OPENAL)
+  IF(WITH_OPENCOLLADA)
+    LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
+    LINK_DIRECTORIES(${PCRE_LIBPATH})
+    LINK_DIRECTORIES(${EXPAT_LIBPATH})
+  ENDIF(WITH_OPENCOLLADA)
 
   IF(WIN32)
     LINK_DIRECTORIES(${PTHREADS_LIBPATH})
@@ -113,6 +118,11 @@ MACRO(SETUP_LIBLINKS
   IF(WITH_FFMPEG)
     TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
   ENDIF(WITH_FFMPEG)
+  IF(WITH_OPENCOLLADA)
+    TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
+    TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
+    TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+  ENDIF(WITH_OPENCOLLADA)
   IF(WIN32)
     TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
   ENDIF(WIN32)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc6a3d3ade8..1f96ed2222e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,7 @@ OPTION(WITH_OPENJPEG		"Enable OpenJpeg Support (http://www.openjpeg.org/)"	OFF)
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
 OPTION(WITH_WEBPLUGIN		"Enable Web Plugin (Unix only)"				OFF)
+OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -140,6 +141,19 @@ IF(UNIX AND NOT APPLE)
     SET(SDL_LIB ${SDL_LIBRARY})
   ENDIF(WITH_SDL)
 
+  IF(WITH_OPENCOLLADA)
+    SET(OPENCOLLADA /usr/local/opencollada)
+    SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
+    SET(OPENCOLLADA_LIB OpenCollada)
+    SET(PCRE /usr)
+    SET(PCRE_LIBPATH ${PCRE}/lib)
+    SET(PCRE_LIB pcre)
+    SET(EXPAT /usr)
+    SET(EXPAT_LIBPATH ${EXPAT}/lib)
+    SET(EXPAT_LIB expat)
+
+  ENDIF(WITH_OPENCOLLADA)
+
   FIND_PATH(OPENEXR_INC
     ImfXdr.h
     PATHS
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index a9e3d50211f..8202c4ef508 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -57,3 +57,7 @@ IF(WITH_PYTHON)
   ADD_SUBDIRECTORY(python)
 ENDIF(WITH_PYTHON)
 
+IF(WITH_OPENCOLLADA)
+  ADD_SUBDIRECTORY(collada)
+ENDIF(WITH_OPENCOLLADA)
+
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 70a25d8662f..d1fc5f9261a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -241,6 +241,7 @@ IF(UNIX)
     bf_openexr 
     bf_dds
     bf_readblenfile 
+    bf_collada
     blender_bop 
     bf_kernel 
     bf_decimation