diff --git a/makehdimage b/makehdimage
index 2a768a374a..d7601df50a 100755
--- a/makehdimage
+++ b/makehdimage
@@ -92,7 +92,7 @@ else
 fi
 
 # paths of helper commands
-rc=$sourceDir/distro/${arch}.R1/beos/bin/rc
+rc=$sourceDir/objects/${arch}.R1/tools/rc/rc
 resattr=$sourceDir/objects/${arch}.R1/tools/resattr/resattr
 fsShellCommand=$sourceDir/objects/${arch}.R1/tests/add-ons/kernel/file_systems/fs_shell/fs_shell_command
 bfsShell=$sourceDir/objects/${arch}.R1/tests/add-ons/kernel/file_systems/bfs/bfs_shell/bfs_shell
diff --git a/src/tools/rc/Jamfile b/src/tools/rc/Jamfile
index 629a4bcb48..4304b2bad7 100644
--- a/src/tools/rc/Jamfile
+++ b/src/tools/rc/Jamfile
@@ -7,14 +7,14 @@ SubDirC++Flags -Wno-sign-compare -Wno-unused ;
 StaticLibrary rdef :
 	compile.cpp decompile.cpp lexer.l parser.y rdef.cpp ;
 
-BinCommand rc :
+BuildPlatformMain rc :
 	rc.cpp
 
 	# these two are needed for R5 only
 	strlcpy.c
 	strlcat.c
-	: librdef.a libstdc++.r4.so libbe.so
-	;
+;
+LinkSharedOSLibs rc : librdef.a $(BUILD_LIBSTDC++) be ;
 
 SEARCH on [ FGristFiles
 		strlcat.c strlcpy.c
diff --git a/src/tools/rc/rc.cpp b/src/tools/rc/rc.cpp
index f64f1c9b0a..5ca7ad1162 100644
--- a/src/tools/rc/rc.cpp
+++ b/src/tools/rc/rc.cpp
@@ -43,6 +43,12 @@ static char sOutputFile[B_PATH_NAME_LENGTH] = { 0 };
 static char *sFirstInputFile = NULL;
 
 
+#ifndef __HAIKU__
+extern "C" size_t	strlcat(char *dest, const char *source, size_t length);
+extern "C" size_t	strlcpy(char *dest, const char *source, size_t length);
+#endif
+
+
 void
 warn(const char *format, ...)
 {