diff --git a/CMakeLists.txt b/CMakeLists.txt
index f58b654c..38458bc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,10 +67,15 @@ else()
                         "Supported compilers at this time are GCC 4.6+ and clang.")
 endif()
 
+
 # Global compile flags
 # These are specific to GCC/MinGW/clang; for other compilers, change as necessary
 # The flags are used throughout src/ and test/ subdirs
-set(COLOBOT_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast ${CXX11_FLAGS}")
+
+# Special flags for boost
+set(Boost_FLAGS "-DBOOST_NO_SCOPED_ENUMS -DBOOST_NO_CXX11_SCOPED_ENUMS")
+
+set(COLOBOT_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast ${CXX11_FLAGS} ${Boost_FLAGS}")
 set(COLOBOT_CXX_FLAGS_RELEASE "-O2")
 set(COLOBOT_CXX_FLAGS_DEBUG "-g -O0")
 
diff --git a/src/common/profile.h b/src/common/profile.h
index ee7ac468..7f99d81b 100644
--- a/src/common/profile.h
+++ b/src/common/profile.h
@@ -23,10 +23,6 @@
 
 #include "common/singleton.h"
 
-// this is just to fix problem with undefined reference when compiling with c++11 support
-#define BOOST_NO_SCOPED_ENUMS
-#define BOOST_NO_CXX11_SCOPED_ENUMS
-
 #include <boost/property_tree/ptree.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/replace.hpp>