diff --git a/Makefile.in b/Makefile.in
index 95c635327..e33c86974 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@ ARCH = x86
 NAME = libhermit.a
 DRIVERDIRS = drivers/net
 LWIPDIRS = lwip/src/arch lwip/src/api lwip/src/core lwip/src/core/ipv4 lwip/src/core/ipv6 lwip/src/netif
-KERNDIRS = kernel mm libkern arch/$(ARCH)/kernel arch/$(ARCH)/mm $(LWIPDIRS) $(DRIVERDIRS)
+KERNDIRS = kernel mm libkern arch/$(ARCH)/kernel arch/$(ARCH)/libkern arch/$(ARCH)/mm $(LWIPDIRS) $(DRIVERDIRS)
 SUBDIRS = $(KERNDIRS)
 TODAY := $(shell date +'%Y%m%d')
 QEMU = @QEMU@ -machine accel=kvm -cpu host
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index fa8de1117..b50382f0b 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -1,5 +1,5 @@
 C_source := irq.c idt.c isrs.c gdt.c processor.c timer.c tasks.c apic.c pci.c uart.c syscall.c signal.c
-ASM_source := entry.asm string.asm
+ASM_source := entry.asm
 MODULE := arch_x86_kernel
 
 include $(TOPDIR)/Makefile.inc
diff --git a/arch/x86/libkern/Makefile b/arch/x86/libkern/Makefile
new file mode 100644
index 000000000..43a85e97e
--- /dev/null
+++ b/arch/x86/libkern/Makefile
@@ -0,0 +1,5 @@
+C_source :=
+ASM_source := string.asm
+MODULE := arch_x86_kernel
+
+include $(TOPDIR)/Makefile.inc
diff --git a/arch/x86/kernel/string.asm b/arch/x86/libkern/string.asm
similarity index 100%
rename from arch/x86/kernel/string.asm
rename to arch/x86/libkern/string.asm