Index: drivers/disk/Tupfile.lua
===================================================================
diff --git a/drivers/disk/Tupfile.lua b/drivers/disk/Tupfile.lua
--- a/drivers/disk/Tupfile.lua	(revision 8723)
+++ b/drivers/disk/Tupfile.lua	(working copy)
@@ -1,3 +1,4 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
 ROOT = "../.."
-tup.rule("tmpdisk.asm", "fasm %f %o " .. tup.getconfig("PESTRIP_CMD") .. tup.getconfig("KPACK_CMD"), "%B.sys")
+tup.include(ROOT .. "/programs/use_fasm.lua")
+tup.rule("tmpdisk.asm", "fasm %f %o " .. PESTRIP_CMD .. tup.getconfig("KPACK_CMD"), "%B.sys")
Index: programs/develop/libraries/console/examples/Tupfile.lua
===================================================================
diff --git a/programs/develop/libraries/console/examples/Tupfile.lua b/programs/develop/libraries/console/examples/Tupfile.lua
--- a/programs/develop/libraries/console/examples/Tupfile.lua	(revision 8723)
+++ b/programs/develop/libraries/console/examples/Tupfile.lua	(working copy)
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
 HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
+ROOT = "../../../../.."
 tup.include(HELPERDIR .. "/use_fasm.lua")
-ROOT = "../../../../.."
-tup.foreach_rule("*.asm", FASM .. " %f %o " .. tup.getconfig("PESTRIP_CMD") .. tup.getconfig("KPACK_CMD"), "%B")
+tup.foreach_rule("*.asm", FASM .. " %f %o " .. PESTRIP_CMD .. tup.getconfig("KPACK_CMD"), "%B")
Index: programs/develop/libraries/dll/dll.asm
===================================================================
diff --git a/programs/develop/libraries/dll/dll.asm b/programs/develop/libraries/dll/dll.asm
--- a/programs/develop/libraries/dll/dll.asm	(revision 8723)
+++ b/programs/develop/libraries/dll/dll.asm	(working copy)
@@ -91,7 +91,7 @@
 
 
 ; WARNING! This code must be after app initialization thunk!
-include '../../dll.inc'
+include '../../../dll.inc'
 align 4
 ;dd 0xdeadbeef
 dd APP_STARTUP_THUNK
@@ -99,4 +99,4 @@
 export                              \
     dll.Load,           'dll_load',  \
     dll.Link,           'dll_link',  \
-    dll.GetProcAddress, 'dll_sym' ;
\ No newline at end of file
+    dll.GetProcAddress, 'dll_sym' ;
Index: programs/use_fasm.lua
===================================================================
diff --git a/programs/use_fasm.lua b/programs/use_fasm.lua
--- a/programs/use_fasm.lua	(revision 8723)
+++ b/programs/use_fasm.lua	(working copy)
@@ -1,5 +1,6 @@
 INCLUDES = ""
 FASM_DEFAULT = "fasm"
+PESTRIP_CMD = string.gsub(tup.getconfig("PESTRIP_CMD"), "$(ROOT)", ROOT or "")
 
 function add_include(dir)
   if INCLUDES == ""