diff --git a/src/system/Jamfile b/src/system/Jamfile
index ac37b10acf..8db67011af 100644
--- a/src/system/Jamfile
+++ b/src/system/Jamfile
@@ -88,6 +88,8 @@ KernelLd kernel_$(TARGET_ARCH) :
 	kernel_os_arch_$(TARGET_ARCH).o
 	kernel_posix.o
 
+	$(HAIKU_STATIC_LIBSUPC++)
+
 	: $(SUBDIR)/ldscripts/$(TARGET_ARCH)/kernel.ld 
 	: -Bdynamic -export-dynamic -dynamic-linker /foo/bar
 	:
@@ -113,6 +115,8 @@ KernelLd kernel.so :
 	kernel_os_arch_$(TARGET_ARCH).o
 	kernel_posix.o
 
+	$(HAIKU_STATIC_LIBSUPC++)
+
 	: $(SUBDIR)/ldscripts/$(TARGET_ARCH)/kernel.ld 
 	: -Bdynamic -shared -export-dynamic -dynamic-linker /foo/bar
 	;
diff --git a/src/system/kernel/util/kernel_cpp.cpp b/src/system/kernel/util/kernel_cpp.cpp
index f06c561f9f..32fc90309a 100644
--- a/src/system/kernel/util/kernel_cpp.cpp
+++ b/src/system/kernel/util/kernel_cpp.cpp
@@ -80,6 +80,23 @@ fputc(int c, FILE *stream)
 	return 0;
 }
 
+extern "C"
+int
+printf(const char *format, ...)
+{
+	// TODO: Introduce a vdprintf()...
+	dprintf("printf(`%s',...)\n", format);
+	return 0;
+}
+
+extern "C"
+int
+puts(const char *string)
+{
+	return fputs(string, NULL);
+}
+
+
 #endif	// __GNUC__ >= 3
 
 extern "C"