diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 7c30d9d925..00a2c7b351 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -492,6 +492,9 @@ if [ IsOptionalHaikuImagePackageAdded Development ]
 		$(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) libglut.so {
 		AddSymlinkToHaikuImage develop lib x86 : /system/lib/$(lib:BS) ;
 	}
+
+	# cc and c++ wrapper scripts
+	AddFilesToHaikuImage beos bin : cc c++ ;
 }
 
 # Vision
diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index ca9d08594f..d3a43b93a8 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -152,6 +152,9 @@ StdBinCommands
 	filepanel.cpp
 	: be tracker : $(haiku-utils_rsrc) ;
 
+# cc and c++ wrapper scripts
+SEARCH on cc c++ = $(SUBDIR) ;
+
 SubInclude HAIKU_TOP src bin addattr ;
 SubInclude HAIKU_TOP src bin bash ;
 SubInclude HAIKU_TOP src bin bc ;
diff --git a/src/bin/c++ b/src/bin/c++
new file mode 100755
index 0000000000..4ad54cc814
--- /dev/null
+++ b/src/bin/c++
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec $BE_CPLUS_COMPILER $BE_DEFAULT_C_FLAGS $BE_DEFAULT_CPLUS_FLAGS $*
diff --git a/src/bin/cc b/src/bin/cc
new file mode 100755
index 0000000000..442d78c6d0
--- /dev/null
+++ b/src/bin/cc
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec $BE_C_COMPILER $BE_DEFAULT_C_FLAGS $*