diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index ad4da600c..6d7ec13e5 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -166,6 +166,8 @@ SOURCE_GROUP( Collada FILES
 	ColladaLoader.h
 	ColladaParser.cpp
 	ColladaParser.h
+	ColladaExporter.h
+	ColladaExporter.cpp
 )
 
 SOURCE_GROUP( DXF FILES
@@ -734,6 +736,8 @@ ADD_LIBRARY( assimp SHARED
 	Profiler.h
 	NDOLoader.cpp
 	NDOLoader.h
+	ColladaExporter.h
+	ColladaExporter.cpp
 
 	# Necessary to show the headers in the project when using the VC++ generator:
 	BoostWorkaround/boost/math/common_factor_rt.hpp
diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp
index 196441e84..1f0ee7402 100644
--- a/code/ColladaExporter.cpp
+++ b/code/ColladaExporter.cpp
@@ -39,6 +39,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "AssimpPCH.h"
+
+#ifndef ASSIMP_BUILD_NO_EXPORT
 #include "ColladaExporter.h"
 
 using namespace Assimp;
@@ -362,3 +364,6 @@ void ColladaExporter::WriteNode( const aiNode* pNode)
 	PopTag();
 	mOutput << startstr << "</node>" << endstr;
 }
+
+#endif
+
diff --git a/tools/assimp_cmd/CMakeLists.txt b/tools/assimp_cmd/CMakeLists.txt
index 2758fcbc6..c26384632 100644
--- a/tools/assimp_cmd/CMakeLists.txt
+++ b/tools/assimp_cmd/CMakeLists.txt
@@ -34,6 +34,7 @@ ADD_EXECUTABLE( assimp_cmd
 	resource.h
 	WriteDumb.cpp
 	Info.cpp
+	Export.cpp
 )
 
 TARGET_LINK_LIBRARIES( assimp_cmd assimp )
diff --git a/tools/assimp_cmd/Main.h b/tools/assimp_cmd/Main.h
index 09c689c53..1cf246a3e 100644
--- a/tools/assimp_cmd/Main.h
+++ b/tools/assimp_cmd/Main.h
@@ -51,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include <limits>
 
 #include <aiPostProcess.h>
 #include <aiVersion.h>
@@ -69,6 +70,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <../contrib/zlib/zlib.h>
 
+#ifndef SIZE_MAX
+#	define SIZE_MAX (std::numeric_limits<size_t>::max())
+#endif
+
+
 using namespace Assimp;
 
 
@@ -197,4 +203,4 @@ int Assimp_TestBatchLoad (
 	unsigned int num);
 
 
-#endif // !! AICMD_MAIN_INCLUDED
\ No newline at end of file
+#endif // !! AICMD_MAIN_INCLUDED