diff --git a/src/kernel/Jamfile b/src/kernel/Jamfile
index 1ae734ec83..5dee69e4ac 100644
--- a/src/kernel/Jamfile
+++ b/src/kernel/Jamfile
@@ -16,6 +16,10 @@ KernelStaticLibraryObjects libkern.a :
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>qsort.o
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>rand.o
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>random.o
+	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtol.o
+	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtoul.o
+	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtoll.o
+	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtoull.o
 
 	<$(SOURCE_GRIST)!libroot!posix!sys>chmod.o
 	<$(SOURCE_GRIST)!libroot!posix!sys>stat.o
@@ -121,6 +125,8 @@ KernelLd kernel
 	<$(SOURCE_GRIST)!core>thread.o 
 	<$(SOURCE_GRIST)!core>timer.o
 
+	linkhack.so
+
 	libbus.a
 	libfs.a
 	libvm.a
@@ -166,6 +172,8 @@ KernelLd kernel.so
 	<$(SOURCE_GRIST)!core>thread.o 
 	<$(SOURCE_GRIST)!core>timer.o
 
+	linkhack.so
+
 	libbus.a
 	libfs.a
 	libvm.a
@@ -409,6 +417,10 @@ KernelLd libroot.so :
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>rand.o
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>random.o
 	<$(SOURCE_GRIST)!libroot!posix!stdlib>realpath.o
+	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtol.o
+	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtoul.o
+	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtoll.o
+	<$(SOURCE_GRIST)!libroot!posix!stdlib>strtoull.o
 
 	<$(SOURCE_GRIST)!libroot!posix!string>memchr.o
 	<$(SOURCE_GRIST)!libroot!posix!string>memcmp.o
diff --git a/src/kernel/core/Jamfile b/src/kernel/core/Jamfile
index 79ee837449..6de473162c 100644
--- a/src/kernel/core/Jamfile
+++ b/src/kernel/core/Jamfile
@@ -13,6 +13,7 @@ KernelObjects
 	<$(SOURCE_GRIST)>heap.c 
 	<$(SOURCE_GRIST)>int.c 
 	<$(SOURCE_GRIST)>khash.c 
+	<$(SOURCE_GRIST)>linkhack.c 
 	<$(SOURCE_GRIST)>lock.c 
 	<$(SOURCE_GRIST)>main.c 
 	<$(SOURCE_GRIST)>misc.c 
@@ -33,6 +34,12 @@ KernelObjects
 	-fno-pic -D_KERNEL_MODE
 	;
 
+KernelLd linkhack.so :
+	<$(SOURCE_GRIST)>linkhack.o
+	:
+	:
+	-shared -Bdynamic
+	;
 
 SubInclude OBOS_TOP src kernel core addons ;
 SubInclude OBOS_TOP src kernel core arch ;