diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 64e7962f13..af5a70b561 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -38,6 +38,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	friss					- RSS/ATOM/... feeds reader
 #	GetText					- a framework to help produce multi-lingual messages.
 #	Git						- the distributed version control system
+#	GPerf					- the perfect hash function generator.
 #	ICU-devel				- the headers for ICU (for development)
 #	KeymapSwitcher			- Easy to use keymap switcher
 #	LibEvent				- An event notification library
@@ -702,6 +703,30 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {
 }
 
 
+# GPerf
+if [ IsOptionalHaikuImagePackageAdded GPerf ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package GPerf available for $(TARGET_ARCH)" ;
+	} else {
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+			InstallOptionalHaikuImagePackage
+				gperf-3.0.4-x86-gcc4-2010-06-15.zip
+				: $(baseURL)/gperf-3.0.4-x86-gcc4-2010-06-15.zip
+				:
+				: true
+			;
+		} else {
+			InstallOptionalHaikuImagePackage
+				gperf-3.0.4-x86-gcc2-2010-06-15.zip
+				: $(baseURL)/gperf-3.0.4-x86-gcc2-2010-06-15.zip
+				:
+				: true
+			;
+		}
+	}
+}
+
+
 # ICU-devel
 if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
 	InstallOptionalHaikuImagePackage icu-devel-4.2-2010-01-26.zip