diff --git a/cmake/BuildMachinarium.cmake b/cmake/BuildMachinarium.cmake
index dc5851a3..50bd043f 100644
--- a/cmake/BuildMachinarium.cmake
+++ b/cmake/BuildMachinarium.cmake
@@ -4,7 +4,7 @@ macro(build_machinarium)
 	if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		add_custom_command(
 			OUTPUT  ${PROJECT_BINARY_DIR}/lib/machinarium/src/libmachinarium${CMAKE_STATIC_LIBRARY_SUFFIX}
-			COMMAND ${CMAKE_COMMAND} ${PROJECT_BINARY_DIR}/lib/machinarium -DBUILD_STATIC=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+			COMMAND ${CMAKE_COMMAND} ${PROJECT_BINARY_DIR}/lib/machinarium -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 			COMMAND ${CMAKE_MAKE_PROGRAM} -C ${PROJECT_BINARY_DIR}/lib/machinarium
 			WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/lib/machinarium
 		)
@@ -13,7 +13,7 @@ macro(build_machinarium)
 			OUTPUT  ${PROJECT_BINARY_DIR}/lib/machinarium/src/libmachinarium${CMAKE_STATIC_LIBRARY_SUFFIX}
 			COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/lib/machinarium
 			COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/lib/machinarium ${PROJECT_BINARY_DIR}/lib/machinarium
-			COMMAND cd ${PROJECT_BINARY_DIR}/lib/machinarium && ${CMAKE_COMMAND} -DBUILD_STATIC=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} .
+			COMMAND cd ${PROJECT_BINARY_DIR}/lib/machinarium && ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} .
 			COMMAND ${CMAKE_MAKE_PROGRAM} -C ${PROJECT_BINARY_DIR}/lib/machinarium
 		)
 	endif()
diff --git a/lib/machinarium b/lib/machinarium
index ac30023f..cb588f49 160000
--- a/lib/machinarium
+++ b/lib/machinarium
@@ -1 +1 @@
-Subproject commit ac30023f1edbc24d1cc10d6b2d3a3fb5c591bd3d
+Subproject commit cb588f49734eb302b98dc372990eed45facacf0b