diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index ccb9603af4..c7007df93d 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -39,7 +39,6 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	DevelopmentBase			- basic development environment (gcc, headers, libs,...)
 #	DevelopmentJava			- JamVM, a Java Virtual machine, GNU Classpath, ECJ
 #	DevelopmentMin			- development headers, libs, tools, from sources only
-#	EtPan					- e-mail libraries
 #	Expat					- XML parsing libraries
 #	Fastdep					- fast dependency generator for C/C++ files
 #	friss					- RSS/ATOM/... feeds reader
@@ -784,30 +783,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
 }
 
 
-# EtPan
-if [ IsOptionalHaikuImagePackageAdded EtPan ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package EtPan available for $(TARGET_ARCH)" ;
-	} else {
-		if $(HAIKU_GCC_VERSION[1]) >= 4 {
-			InstallOptionalHaikuImagePackage
-				etpan-1.0-x86-gcc4-2010-10-20.zip
-				: $(baseURL)/etpan-1.0-x86-gcc4-2010-10-20.zip
-				:
-				: true
-			;
-		} else {
-			InstallOptionalHaikuImagePackage
-				etpan-1.0-x86-gcc2-2010-10-20.zip
-				: $(baseURL)/etpan-1.0-x86-gcc2-2010-10-20.zip
-				:
-				: true
-			;
-		}
-	}
-}
-
-
 # Expat
 if [ IsOptionalHaikuImagePackageAdded Expat ] {
 	if $(TARGET_ARCH) != x86 {