diff --git a/CMakeLists.txt b/CMakeLists.txt
index 967dc791..1181a107 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,9 +24,6 @@ include(compilerconfig)
 OPTION( BUILD_OVP    "Build OVP Variant?" OFF) # Defaults to BOCHS  ON
 OPTION( BUILD_BOCHS  "Build Bochs Variant?" ON)
 
-#### Configuration file emitting BUILD_OVP/BOCHS defines ####
-configure_file(${CMAKE_SOURCE_DIR}/core/variant_config.h.cmake ${CMAKE_SOURCE_DIR}/core/variant_config.h)
-
 if(BUILD_OVP)
   message(STATUS "[${PROJECT_NAME}] Building OVP variant...")
   SET(VARIANT ovp)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index a4765dda..059e661d 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -30,8 +30,7 @@ endif(DOXYGEN_FOUND)
 
 ## Add CMakeLists from subdirectories ##
 # The autogenerated header files
-# FIXME disabled for now; we'll need it later on for other configuration stuff.
-#add_subdirectory(config)
+add_subdirectory(config)
 
 # fail* targets
 add_subdirectory(jobserver)
diff --git a/core/SAL/SALConfig.hpp b/core/SAL/SALConfig.hpp
index f292e60f..c9bb3529 100644
--- a/core/SAL/SALConfig.hpp
+++ b/core/SAL/SALConfig.hpp
@@ -4,7 +4,7 @@
 
 
 #include <stdint.h>
-#include "../variant_config.h"
+#include "config/variant_config.h"
 
 #if defined BUILD_BOCHS
 
diff --git a/core/SAL/SALInst.hpp b/core/SAL/SALInst.hpp
index 9f1b31f8..378d44d3 100644
--- a/core/SAL/SALInst.hpp
+++ b/core/SAL/SALInst.hpp
@@ -2,7 +2,7 @@
   #define __SAL_INSTANCE_HPP__
 
 #include "SALConfig.hpp"
-#include "../variant_config.h"
+#include "config/variant_config.h"
 
 #ifdef BUILD_BOCHS
 
diff --git a/core/config/CMakeLists.txt b/core/config/CMakeLists.txt
index 32020019..5042b376 100644
--- a/core/config/CMakeLists.txt
+++ b/core/config/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-option( EXP_MHTEST    "MH Testcampaign" on) 
-option( EXP_FAULTCOV   "Fault coverage experiment" OFF) 
-option( EXP_HSCSIMPLE    "HSC simple experiment" OFF) 
-option( EXP_COOLCHECKSUM "Test campaign for chb's cool checksum" OFF) 
-option( EXP_CHECKSUM_OOSTUBS "OOStuBS Checksum" OFF) 
-
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/experiments.hpp.in
-		${CMAKE_CURRENT_BINARY_DIR}/experiments.hpp @ONLY}
-)
-
-
+#### Configuration file emitting BUILD_OVP/BOCHS defines ####
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/variant_config.h.in
+               ${CMAKE_CURRENT_BINARY_DIR}/variant_config.h)
diff --git a/core/config/experiments.hpp.in b/core/config/experiments.hpp.in
deleted file mode 100644
index 679bef95..00000000
--- a/core/config/experiments.hpp.in
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright DanceOS Project
- * http://www.danceos.org
- *
- * \file experiments.h.in
- * \brief Experiment configuration
- * \author Martin Hoffmann <hoffmann@cs.fau.de>
- *
- * The defines are generated by cmake. 
- * \attention THIS FILE IS AUTOGENERATED, DO NOT EDIT!
- */
-
-
-#ifndef EXPERIMENTS_H
-#define EXPERIMENTS_H
-
-#cmakedefine EXP_MHTEST
-#cmakedefine EXP_FAULTCOV
-#cmakedefine EXP_HSCSIMPLE
-#cmakedefine EXP_COOLCHECKSUM
-#cmakedefine EXP_CHECKSUM_OOSTUBS
-
-#endif // EXPERIMENTS_H
-
diff --git a/core/variant_config.h.cmake b/core/config/variant_config.h.in
similarity index 53%
rename from core/variant_config.h.cmake
rename to core/config/variant_config.h.in
index d2b8d456..f12fe4dd 100644
--- a/core/variant_config.h.cmake
+++ b/core/config/variant_config.h.in
@@ -1,8 +1,7 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef VARIANT_CONFIG_H
+#define VARIANT_CONFIG_H
 
 #cmakedefine BUILD_OVP
 #cmakedefine BUILD_BOCHS
 
 #endif
-