diff --git a/src/system/libroot/stubbed/Jamfile b/src/system/libroot/stubbed/Jamfile
index a1b5a6107e..012b503d4a 100644
--- a/src/system/libroot/stubbed/Jamfile
+++ b/src/system/libroot/stubbed/Jamfile
@@ -10,11 +10,14 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		local stubsSource ;
 		if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
 			stubsSource = [ FGristFiles libroot_stubs_legacy.c ] ;
+		} else if $(TARGET_PACKAGING_ARCH) = x86 {
+			stubsSource = [ FGristFiles libroot_stubs.c libroot_stubs_x86.c ] ;
 		} else if $(TARGET_PACKAGING_ARCH) = sparc {
 			stubsSource = [ FGristFiles libroot_stubs.c libroot_stubs_sparc.c ] ;
 		} else {
 			stubsSource = [ FGristFiles libroot_stubs.c ] ;
 		}
+
 		local stubsObject = $(stubsSource:S=$(SUFOBJ)) ;
 		CCFLAGS on $(stubsObject) = -Wno-missing-prototypes -fno-builtin ;
 		Depends $(stubsObject) : $(stubsSource) ;
diff --git a/src/system/libroot/stubbed/libroot_stubs_x86.c b/src/system/libroot/stubbed/libroot_stubs_x86.c
new file mode 100644
index 0000000000..84eaf58f68
--- /dev/null
+++ b/src/system/libroot/stubbed/libroot_stubs_x86.c
@@ -0,0 +1 @@
+void ___tls_get_addr() {}