diff --git a/CMakeLists.txt b/CMakeLists.txt
index e145d1ebc1015c9f0d9d8c8f379a634bdeca079c..684d11728425161571e86b457cdda6b86f1c280b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,10 +26,10 @@ SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 #### Compiler configuration, see cmake/compilerconfig.cmake
 include(compilerconfig)
 
-#### #OPTION to configure Bochs/OVP ####
-OPTION( BUILD_OVP    "Build OVP Variant?" OFF) # Defaults to BOCHS  ON
-OPTION( BUILD_GEM5   "Build gem5 Variant?" OFF)
+#### Backend selection ####
 OPTION( BUILD_BOCHS  "Build Bochs Variant?" ON)
+OPTION( BUILD_GEM5   "Build gem5 Variant?" OFF)
+OPTION( BUILD_OVP    "Build OVP Variant?" OFF)
 
 if(BUILD_BOCHS)
   ## add necessary additional header search paths.
diff --git a/src/core/sal/CMakeLists.txt b/src/core/sal/CMakeLists.txt
index 01428081c553fd2bddeba4696b145fe0f4e5e60b..94020fcf61b1b1f45171087b86a5efe05d0d26ef 100644
--- a/src/core/sal/CMakeLists.txt
+++ b/src/core/sal/CMakeLists.txt
@@ -9,7 +9,7 @@ if(BUILD_BOCHS)
 		bochs/BochsController.cc
 		bochs/BochsListener.cc
 	)
-elseif(BUILD_OVP)
+elseif(BUILD_GEM5)
 	set(SRCS
 		BufferCache.cc
 		Listener.cc
@@ -17,9 +17,11 @@ elseif(BUILD_OVP)
 		SALConfig.cc
 		Register.cc
 		SimulatorController.cc
-		${VARIANT}/OVPController.cc
+		gem5/Gem5Controller.cc
+		gem5/Gem5Listener.cc
+		gem5/Gem5PCEvent.cc
 	)
-elseif(BUILD_GEM5)
+elseif(BUILD_OVP)
 	set(SRCS
 		BufferCache.cc
 		Listener.cc
@@ -27,9 +29,7 @@ elseif(BUILD_GEM5)
 		SALConfig.cc
 		Register.cc
 		SimulatorController.cc
-		gem5/Gem5Controller.cc
-		gem5/Gem5Listener.cc
-		gem5/Gem5PCEvent.cc
+		${VARIANT}/OVPController.cc
 	)
 endif(BUILD_BOCHS)