diff --git a/package/linux/runisoworld b/package/linux/runisoworld
new file mode 100755
index 000000000..2d66875d8
--- /dev/null
+++ b/package/linux/runisoworld
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+DF_DIR=$(dirname "$0")
+cd "${DF_DIR}"
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"stonesense/deplibs":"hack"
+
+./isoworld/isoworld "$@"
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 0bbc209c1..c2edc6b4a 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -13,7 +13,16 @@ endif()
 
 OPTION(BUILD_ISOWORLD "Build isoworld (needs a checkout first)." OFF)
 if(BUILD_ISOWORLD)
-    add_subdirectory (isoworld)
+	add_subdirectory (isoworld)
+	IF(UNIX)
+		if (APPLE)
+			#TODO: add an OSX runner script
+		else()
+		# On linux, copy our version of the df launch script which sets LD_PRELOAD
+		install(PROGRAMS ${dfhack_SOURCE_DIR}/package/linux/runisoworld
+			DESTINATION .)
+		endif()
+	ENDIF()
 endif()
 
 OPTION(BUILD_DEV_PLUGINS "Build developer plugins." OFF)
diff --git a/plugins/isoworld b/plugins/isoworld
index 2a409fa68..d9f03718f 160000
--- a/plugins/isoworld
+++ b/plugins/isoworld
@@ -1 +1 @@
-Subproject commit 2a409fa6870aa098ff00c5572cd7988e52e952b8
+Subproject commit d9f03718f521d2f02809dd33a093b1e5fd923aed
diff --git a/plugins/stonesense b/plugins/stonesense
index 83e2b8a37..670b4ff63 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit 83e2b8a3754e2feb0d5bf106d2b43ff71ff63935
+Subproject commit 670b4ff6300e8134dc6402336474626e548d0a07