diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 7841673a61..41e72a2ad9 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -774,7 +774,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 } else {
 	HOST_LIBSTDC++ = stdc++ ;
 	HOST_LIBROOT = libroot_build_function_remapper.a libroot_build.so ;
-	HOST_STATIC_LIBROOT = libroot_build.a ;
+	HOST_STATIC_LIBROOT = libroot_build_function_remapper.a libroot_build.a ;
 	HOST_LIBBE = libbe_build.so ;
 	if $(HOST_PLATFORM) = cygwin {
 		HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR
diff --git a/src/build/libroot/Jamfile b/src/build/libroot/Jamfile
index 34f947ed00..e1ebd9d509 100644
--- a/src/build/libroot/Jamfile
+++ b/src/build/libroot/Jamfile
@@ -80,11 +80,10 @@ BuildPlatformSharedLibrary libroot_build.so :
 	$(HOST_LIBSUPC++) $(HOST_LIBSTDC++)
 ;
 
-# TODO: This doesn't work with the function remapping.
-#BuildPlatformStaticLibrary libroot_build.a :
-#	:
-#	[ FGristFiles $(librootSources:S=$(SUFOBJ)) ]
-#;
+BuildPlatformStaticLibrary libroot_build.a :
+	:
+	[ FGristFiles $(librootSources:S=$(SUFOBJ)) ]
+;
 
 USES_BE_API on [ FGristFiles function_remapper$(SUFOBJ) ] = true ;