diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index e9d58ccb34..6eafcc6568 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -15,6 +15,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 #	APR-util
 #	Beam
 #	Bluetooth
+#	CVS
 #	Development
 #	Firefox
 #	Links
@@ -100,6 +101,22 @@ if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
 }
 
 
+# CVS
+if [ IsOptionalHaikuImagePackageAdded CVS ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package CVS available for $(TARGET_ARCH)" ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
+		Echo "No optional package CVS available for gcc4" ;
+	} else {
+		local baseURL = http://haiku-files.org/files/optional-packages ;
+		InstallOptionalHaikuImagePackage cvs-1.11.21-gcc2-2008-07-23
+			: $(baseURL)/cvs-1.11.21-gcc2-2008-07-23.zip
+			:
+		;
+	}
+}
+
+
 # Development
 if [ IsOptionalHaikuImagePackageAdded Development ]
 		&& $(TARGET_ARCH) = x86 {