diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 2274ee2447..474ff6c71b 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -106,6 +106,14 @@ define Build/Install/post/lzma
 		$(TOOLCHAIN_DIR)/usr/include/asm/
 endef
 
+# XXX: the following is needed to build final gcc on cris
+define Build/Install/post/cris
+	mkdir -p $(TOOLCHAIN_DIR)/usr/include/asm/arch
+	$(CP) \
+		$(PKG_BUILD_DIR)/include/asm-cris/arch/ptrace.h \
+		$(TOOLCHAIN_DIR)/usr/include/asm/arch/
+endef
+
 define Build/Install/post/mips
 	$(call Build/Install/post/lzma)
 endef