diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 1db413731d..cca8ce7266 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -21,6 +21,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 #	BePDF
 #	Bluetooth
 #	CDRecord
+#	CLucene
 #	CVS
 #	Development			- more complete dev environment (including autotools)
 #	DevelopmentBase		- basic development environment (gcc, headers, libs,...)
@@ -201,6 +202,22 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
 }
 
 
+# CLucene
+if [ IsOptionalHaikuImagePackageAdded CLucene ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package CLucene available for $(TARGET_ARCH)" ;
+	} else if $(HAIKU_GCC_VERSION[1]) < 4 && $(isHybridBuild) = 0 {
+		Echo "No optional package CLucene available for GCC2" ;
+	} else {
+		local baseURL = http://haiku-files.org/files/optional-packages ;
+		InstallOptionalHaikuImagePackage clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11
+			: $(baseURL)/clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11.zip
+			:
+		;
+	}
+}
+
+
 # CVS
 if [ IsOptionalHaikuImagePackageAdded CVS ] {
 	if $(TARGET_ARCH) != x86 {