diff --git a/linker/Android.mk b/linker/Android.mk
index 27a6677..52f7ce3 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -49,6 +49,7 @@
 else
   ifeq ($(TARGET_ARCH),x86)
     LOCAL_CFLAGS += -DANDROID_X86_LINKER
+    LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/arch-x86/bionic
   else
     ifeq ($(TARGET_ARCH),sh)
       LOCAL_CFLAGS += -DANDROID_SH_LINKER
diff --git a/linker/arch/x86/begin.S b/linker/arch/x86/begin.S
index b4427e0..5be59cb 100644
--- a/linker/arch/x86/begin.S
+++ b/linker/arch/x86/begin.S
@@ -44,3 +44,5 @@
         popl   %esp
         jmp    *%eax
 
+
+#include "__stack_chk_fail_local.S"