diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 8ef75ea2f5..9d6cb3575d 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -24,6 +24,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 #	Clockwerk			- native audio/video compositing
 #	CLucene				- indexed file search
 #	Curl				- a client that groks URLs
+#	CMake				- cross platform make
 #	CVS					- the version control system
 #	Development			- more complete dev environment (including autotools)
 #	DevelopmentBase		- basic development environment (gcc, headers, libs,...)
@@ -246,6 +247,20 @@ if [ IsOptionalHaikuImagePackageAdded CLucene ] {
 }
 
 
+# CMake
+if [ IsOptionalHaikuImagePackageAdded CMake ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package CMake available for $(TARGET_ARCH)" ;
+	} else {
+		InstallOptionalHaikuImagePackage cmake-2.8.0-rc3-x86-gcc2-2009-10-27
+			: $(baseURL)/cmake-2.8.0-rc3-x86-gcc2-2009-10-27.zip
+			:
+			: true
+		;
+	}
+}
+
+
 # Curl
 if [ IsOptionalHaikuImagePackageAdded Curl ] {
 	if $(TARGET_ARCH) != x86 {