diff --git a/lib/libdevuansdk b/lib/libdevuansdk
index d28e0a9..60ecf2a 160000
--- a/lib/libdevuansdk
+++ b/lib/libdevuansdk
@@ -1 +1 @@
-Subproject commit d28e0a93f4561099adc6c270027ed3331ce44489
+Subproject commit 60ecf2ada82f34d4b0e0cf652914fa6744558413
diff --git a/sdk b/sdk
index 2a88e87..6dab96c 100755
--- a/sdk
+++ b/sdk
@@ -86,7 +86,7 @@ load() {
 	)
 
 	os_map=(
-	    "devuan"          "$R/lib/libdevuansdk/libdevuansdk"
+		"devuan"          "$R/lib/libdevuansdk/libdevuansdk"
 	)
 
 	boardlib="${board_map[$dev]}"
@@ -99,7 +99,7 @@ load() {
 	export OS=$os
 	source $oslib
 
-	workdir="$R/tmp/${device_name}-build"
+	workdir="$R/tmp/${os}-${arch}-build"
 	strapdir="$workdir/bootstrap"
 	mkdir -p $strapdir