diff --git a/Base b/Base
index f31f6e3ae0a097c2e04bc750589e00ccc972feaf..5c54ef0065f46b07dbea44644515a00665563235 160000
--- a/Base
+++ b/Base
@@ -1 +1 @@
-Subproject commit f31f6e3ae0a097c2e04bc750589e00ccc972feaf
+Subproject commit 5c54ef0065f46b07dbea44644515a00665563235
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f0e8eb9ea4d98ce77d2416c19c598d8581864e8..00c84b9a94354d69e9d8605d56b34fc2b8c198ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,10 @@ set(COMISO_LINK_DIRECTORIES "")
 set(COMISO_LINK_LIBRARIES "")
 set(NEED_LAPACK "")
 
+option(COMISO_BUILD_WITHOUT_BOOST "Build CoMISo without boost" OFF)
+
 FIND_PACKAGE( Boost 1.59.0 COMPONENTS system filesystem regex QUIET)
-if(Boost_FOUND)
+if(Boost_FOUND AND NOT COMISO_BUILD_WITHOUT_BOOST)
   set (COMISO_BOOST_CONFIG_FILE_SETTINGS "#define COMISO_BOOST_AVAILABLE 1" )
   list( APPEND COMISO_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS} )
   list( APPEND COMISO_LINK_DIRECTORIES    ${Boost_LIBRARY_DIR} )
@@ -58,7 +60,11 @@ if(Boost_FOUND)
 
 else()
   set (COMISO_BOOST_CONFIG_FILE_SETTINGS "#define COMISO_BOOST_AVAILABLE 0" )
-  message (STATUS "Boost not found!")
+  if(COMISO_BUILD_WITHOUT_BOOST)
+    message (STATUS "Building without boost (COMISO_BUILD_WITHOUT_BOOST flag is set)")
+  else()
+    message (STATUS "Boost not found!")
+  endif()
 endif ()