diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 99071e4548..756b7ca582 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -15,6 +15,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 #	ABI-compliance-checker	- tool for checking ABI compatibility between libs
 #	APR						- support libraries used for example by Subversion
 #	APR-util				- Apache portable runtime utility library
+#	BeAE					- open source Audio Editor
 #	Beam					- powerful native e-mail client
 #	BeBook					- the classic BeOS API documentation
 #	BeHappy					- special documentation (i.e. BeBook) browser
@@ -110,6 +111,23 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
 }
 
 
+# BeAE
+if [ IsOptionalHaikuImagePackageAdded BeAE ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+		Echo "No optional package BeAE available for gcc4" ;
+	} else {
+		InstallOptionalHaikuImagePackage beae-20-x86-gcc2-2010-03-14.zip
+			: $(baseURL)/beae-20-x86-gcc2-2010-03-14.zip
+			:
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/BeAE/BeAE ;
+	}
+}
+
+
 # Beam
 if [ IsOptionalHaikuImagePackageAdded Beam ] {
 	if $(TARGET_ARCH) != x86 {