diff --git a/package/linux/dfhack b/package/linux/dfhack
index 46d32f529..28ec21e98 100755
--- a/package/linux/dfhack
+++ b/package/linux/dfhack
@@ -53,6 +53,11 @@ case "$1" in
     LD_PRELOAD=./libdfhack.so valgrind $DF_VALGRIND_OPTS --log-file=valgrind.log ./libs/Dwarf_Fortress $*
     ret=$?
     ;;
+  -c | --callgrind)
+    shift
+    LD_PRELOAD=./libdfhack.so valgrind $DF_CALLGRIND_OPTS --tool=callgrind --separate-threads=yes --dump-instr=yes --instr-atstart=no --log-file=callgrind.log ./libs/Dwarf_Fortress $*
+    ret=$?
+    ;;
   *)
     LD_PRELOAD=./libdfhack.so ./libs/Dwarf_Fortress $*
     ret=$?
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 477dd57ea..60f57ab37 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -102,6 +102,12 @@ if(BUILD_QTPLUG)
     add_subdirectory (qtplug)
 endif()
 
+OPTION(BUILD_STONESENSE "Build stonesense (needs a checkout first)." OFF)
+if(BUILD_STONESENSE)
+    add_subdirectory (stonesense)
+endif()
+
+
 OPTION(BUILD_KITTENS "Build the kittens plugin." OFF)
 if(BUILD_KITTENS)
     DFHACK_PLUGIN(kittens kittens.cpp)
@@ -114,6 +120,7 @@ IF(UNIX)
     endif()
 endif()
 
+
 DFHACK_PLUGIN(reveal reveal.cpp)
 DFHACK_PLUGIN(prospector prospector.cpp)
 DFHACK_PLUGIN(cleanmap cleanmap.cpp)