diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index b124d2d8c..d827cf3c1 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -121,7 +121,7 @@ IF(UNIX)
   add_definitions(-DLINUX_BUILD)
   SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall")
   SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -m32 -std=c++0x")
-  SET(CMAKE_C_FLAGS "-fvisibility=hidden -m32 -std=c++0x")
+  SET(CMAKE_C_FLAGS "-fvisibility=hidden -m32")
 
   SET(PROJECT_LIBS rt )
 ELSE()
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 9915cc9dd..11b5d690d 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -99,9 +99,10 @@ ENDMACRO(DFHACK_PLUGIN)
 #RECURSE_DIRS()
 
 # Dfusion plugin (Windows only right now)
-IF(NOT UNIX)
+OPTION(BUILD_DFUSION "Build DFusion." ON)
+if(NOT UNIX AND BUILD_DFUSION)
     add_subdirectory (Dfusion)
-ENDIF()
+endif()
 
 OPTION(BUILD_QTPLUG "Build the experimental Qt plugin." OFF)
 if(BUILD_QTPLUG)