diff --git a/templates/klibc/patches/Kbuild.klibc.diff b/templates/klibc/patches/Kbuild.klibc.diff
new file mode 100644
index 0000000000..4e61712e05
--- /dev/null
+++ b/templates/klibc/patches/Kbuild.klibc.diff
@@ -0,0 +1,10 @@
+--- scripts/Kbuild.klibc.orig	2009-10-16 02:56:59.000000000 +0200
++++ scripts/Kbuild.klibc	2009-10-16 02:57:45.000000000 +0200
+@@ -104,6 +104,7 @@ KLIBCCPPFLAGS    := -nostdinc -iwithpref
+ # kernel include paths
+ KLIBCKERNELSRC	 ?= $(srctree)/
+ KLIBCCPPFLAGS    += -I$(KLIBCKERNELSRC)include		\
++		    -I$(KLIBCKERNELSRC)arch/x86/include	\
+                      $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)include2 -I$(KLIBCKERNELOBJ)include -I$(srctree)/include)    \
+ 		     $(KLIBCARCHINCFLAGS)
+ 
diff --git a/templates/klibc/patches/fix_i386_archsignal_h.diff b/templates/klibc/patches/fix_i386_archsignal_h.diff
new file mode 100644
index 0000000000..a68775a269
--- /dev/null
+++ b/templates/klibc/patches/fix_i386_archsignal_h.diff
@@ -0,0 +1,11 @@
+--- usr/include/arch/i386/klibc/archsignal.h.orig	2009-10-16 02:58:39.000000000 +0200
++++ usr/include/arch/i386/klibc/archsignal.h	2009-10-16 02:58:52.000000000 +0200
+@@ -96,7 +96,7 @@ typedef struct {
+ #define MINSIGSTKSZ	2048
+ #define SIGSTKSZ	8192
+ 
+-#include <asm-generic/signal.h>
++#include <asm-generic/signal-defs.h>
+ 
+ /* This uses gcc anonymous union support... */
+ struct siginfo;
diff --git a/templates/klibc/patches/mntproc_definitions.diff b/templates/klibc/patches/mntproc_definitions.diff
new file mode 100644
index 0000000000..71c4a8939e
--- /dev/null
+++ b/templates/klibc/patches/mntproc_definitions.diff
@@ -0,0 +1,14 @@
+--- usr/kinit/nfsmount/mount.c.orig	2009-10-16 02:59:38.000000000 +0200
++++ usr/kinit/nfsmount/mount.c	2009-10-16 03:00:08.000000000 +0200
+@@ -44,6 +44,11 @@ struct mount_reply {
+ 
+ #define MNT_REPLY_MINSIZE (sizeof(struct rpc_reply) + sizeof(uint32_t))
+ 
++#ifndef MNTPROC_MNT
++#  define MNTPROC_MNT	1
++#  define MNTPROC_UMNT	3
++#endif /* MNTPROC_MNT */
++
+ static int get_ports(uint32_t server, const struct nfs_mount_data *data)
+ {
+ 	uint32_t nfs_ver, mount_ver;
diff --git a/templates/klibc/template b/templates/klibc/template
index fb171e93d3..15fa661080 100644
--- a/templates/klibc/template
+++ b/templates/klibc/template
@@ -21,5 +21,8 @@ Add_dependency build perl
 
 pre_configure()
 {
-	cd $wrksrc && ln -s $XBPS_MASTERDIR/usr/src/linux linux
+	local kver="$(xbps-pkgdb -r / version kernel-headers)"
+
+	cd $wrksrc || return 1
+	ln -s /usr/src/kernel-headers-$kver linux
 }