diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 17dbbe8b0e..1904fb7653 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=gdbserver
 PKG_VERSION:=6.3
 PKG_RELEASE:=1
 
-GDB_DIR:=$(TOOLCHAIN_BUILD_DIR)/gdb-$(PKG_VERSION)
+GDB_DIR:=$(BUILD_DIR_TOOLCHAIN)/gdb-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 1f6e7a8ac7..011ec959c8 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/kernel-defaults.mk
 
 define Build/Prepare/cris
 	mkdir -p $(BUILD_DIR_TOOLCHAIN)
-	bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS)
+	bzcat $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(BUILD_DIR_TOOLCHAIN) $(TAR_OPTIONS)
 	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/generic_2.6
 	$(PATCH) $(PKG_BUILD_DIR) $(TOPDIR)/target/linux/etrax-2.6/patches/cris
 	ln -sf arch-v10 $(PKG_BUILD_DIR)/include/asm-cris/arch