diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 269787a1..1f1ffdbf 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -64,6 +64,7 @@ done
 # Where will we work?
 CT_WORK_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}"
 CT_DoExecLog ALL mkdir -p "${CT_WORK_DIR}"
+CT_DoExecLog DEBUG rm -f "${CT_WORK_DIR}/backtrace"
 
 # Check build file system case-sensitiveness
 CT_DoExecLog DEBUG touch "${CT_WORK_DIR}/foo"
diff --git a/scripts/functions b/scripts/functions
index 9a47688b..51807264 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -11,8 +11,8 @@ CT_OnError() {
 
     # To avoid printing the backtace for each sub-shell
     # up to the top-level, just remember we've dumped it
-    if [ ! -f "${CT_BUILD_DIR}/backtrace" ]; then
-        touch "${CT_BUILD_DIR}/backtrace"
+    if [ ! -f "${CT_WORK_DIR}/backtrace" ]; then
+        touch "${CT_WORK_DIR}/backtrace"
 
         # Print steps backtrace
         step_depth=${CT_STEP_COUNT}
@@ -50,7 +50,7 @@ CT_OnError() {
 
         CT_DoLog ERROR ""
         CT_DoEnd ERROR
-        rm -f "${CT_BUILD_DIR}/backtrace"
+        rm -f "${CT_WORK_DIR}/backtrace"
     fi
     exit $ret
 }