diff --git a/library/xml b/library/xml
index 03b768f11..3366573d3 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 03b768f1158e675f2a4937ce857f2cd5acb58103
+Subproject commit 3366573d365cbce65326da6154c776381b2ffa05
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index de87481af..349e9a4cd 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -40,6 +40,10 @@ if (BUILD_MAPEXPORT)
     add_subdirectory (mapexport)
 endif()
 
+OPTION(BUILD_DWARFEXPORT "Build dwarf exporter." ON)
+if (BUILD_DWARFEXPORT)
+    add_subdirectory (export)
+endif()
 
 DFHACK_PLUGIN(reveal reveal.cpp)
 DFHACK_PLUGIN(probe probe.cpp)
@@ -74,8 +78,6 @@ DFHACK_PLUGIN(fixveins fixveins.cpp)
 DFHACK_PLUGIN(fixpositions fixpositions.cpp)
 #DFHACK_PLUGIN(versionosd versionosd.cpp)
 
-add_subdirectory(export)
-
 # this is the skeleton plugin. If you want to make your own, make a copy and then change it
 OPTION(BUILD_SKELETON "Build the skeleton plugin." OFF)
 if(BUILD_SKELETON)