diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98b4ee497d6..8e1bcbe407a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,20 +23,31 @@ else()
 set(IMPORT_EXECUTABLES "${REACTOS_SOURCE_DIR}/build/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
 include(${IMPORT_EXECUTABLES})
 
-add_definitions(-DDBG=1)
-add_definitions(-D_SEH_ENABLE_TRACE)
-add_definitions(-DKDBG=1)
-add_definitions(-DWINVER=0x502)
-add_definitions(-D_WIN32_IE=0x600)
-add_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINDOWS=0x502)
-add_definitions(-D_SETUPAPI_VER=0x502)
-add_definitions(-D_M_IX86)
-add_definitions(-D_X86_)
-add_definitions(-D__i386__)
+# Debug Options
+add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE -DKDBG=1)
+
+# Version Options
+add_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502 -D_WIN32_WINDOWS=0x502 -D_SETUPAPI_VER=0x502)
+
+# Arch Options
+add_definitions(-D_M_IX86 -D_X86_ -D__i386__)
+
+# Other
 add_definitions(-DUSE_COMPILER_EXCEPTIONS)
 add_definitions(-D_USE_32BIT_TIME_T)
 
+# Compiler Core
+add_definitions(-gstabs+ -pipe -fms-extensions -fno-set-stack-executable)
+
+# Tuning
+add_definitions(-march=pentium -mtune=i686)
+
+# Warnings
+add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value)
+
+# Optimizations
+add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-optimize-sibling-calls)
+
 include_directories(./include)
 include_directories(./include/psdk)
 include_directories(${REACTOS_BINARY_DIR}/include/psdk)