diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bd7e3ea..e6143bb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,9 +47,10 @@ elseif(BUILD_QEMU)
   include_directories(simulators)
 endif(BUILD_BOCHS)
 
-## Additional Compiler flags ##
+## Additional compiler and linker flags ##
 set(CMAKE_C_FLAGS "-g -Wall")
 set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") 
+set(CMAKE_EXE_LINKER_FLAGS "-Wl,-gc-sections")
 ## Tell the linker where to find the Fail* libraries
 link_directories("${LIBRARY_OUTPUT_PATH}")
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc5f0d28..45e11beb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,4 +37,4 @@ set(experiment_libraries "")
 foreach(exp_or_plugin ${EXPERIMENTS_ACTIVATED} ${PLUGINS_ACTIVATED})
     set(experiment_libraries ${experiment_libraries} fail-${exp_or_plugin})
 endforeach(exp_or_plugin)
-target_link_libraries(fail -Wl,--start-group ${experiment_libraries} fail-sal fail-cpn fail-efw fail-comm fail-util -Wl,--end-group)
+target_link_libraries(fail -Wl,-whole-archive ${experiment_libraries} fail-sal fail-cpn fail-efw fail-comm fail-util -Wl,-no-whole-archive)