diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7364335c50..85f606b305 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,9 +75,9 @@ endif (DISABLE_HTTP_TWITCH)
 
 option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.")
 option(STATIC "Create a static build.")
-option(FORCE64 "Force native (x86-64) build. Do not use, for experimental purposes only.")
+option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags")
 option(DISABLE_OPENGL "Disable OpenGL support.")
-option(DISABLE_RCT2 "Build a standalone version, without using code and data segments from vanilla.")
+option(DISABLE_RCT2 "Build a standalone version, without using code and data segments from vanilla. On by default." ON)
 option(USE_MMAP "Use mmap to try loading rct2's data segment into memory.")
 option(LAUNCHPAD_BUILD "Sets some build system options on launchpad.net")
 
@@ -92,16 +92,12 @@ if (LAUNCHPAD_BUILD)
 	# Launchpad turns on -Wdate-time for compilers that support it, this shouldn't break our build
 	set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -Wno-error=date-time")
 else()
-	if (FORCE64)
-		set(TARGET_M "-m64")
-	else ()
+	if (FORCE32)
 		set(TARGET_M "-m32")
 	endif()
 endif()
 
-if (FORCE64)
-	set (DISABLE_RCT2 ON)
-else ()
+if (FORCE32)
 	set(OBJ_FORMAT "elf32-i386")
 	set(LINKER_SCRIPT "ld_script_i386.xc")
 endif ()
@@ -364,7 +360,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/g2.dat" DESTINATION share/${PROJECT})
 install(DIRECTORY data/ DESTINATION share/${PROJECT})
 install(FILES ${DOC_FILES} DESTINATION share/doc/${PROJECT})
 
-if (UNIX AND (NOT USE_MMAP) AND (NOT DISABLE_RCT2) AND (NOT FORCE64))
+if (UNIX AND (NOT USE_MMAP) AND (NOT DISABLE_RCT2) AND (FORCE32))
 	file(GLOB_RECURSE ORCT2_RIDE_SOURCES "src/ride/*/*.c")
 	file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "src/ride/ride_data.c" "src/ride/track_data.c" "src/ride/track_data_old.c" "src/ride/track_paint.c" "src/addresses.c" "src/diagnostic.c" "src/hook.c" "src/paint/map_element/map_element.c" "src/paint/paint_helpers.c")
 	file(GLOB_RECURSE ORCT2_TESTPAINT_SOURCES "test/testpaint/*.c" "test/testpaint/*.cpp" "test/testpaint/*.h")