diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 44b8030b41..c08ebbeb2b 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -109,6 +109,47 @@ if $(TARGET_ARCH) = ppc {
 	] ;
 }
 
+
+# EtPan
+
+# Automatically install the EtPan mail lib, when the optional EtPan optional
+# package is enabled.
+if [ IsOptionalHaikuImagePackageAdded EtPan ] {
+	HAIKU_BUILD_FEATURE_ETPAN = 1 ;
+}
+
+HAIKU_ETPAN_GCC_2_PACKAGE = etpan-1.0-x86-gcc2-2010-10-20.zip ;
+HAIKU_ETPAN_GCC_4_PACKAGE = etpan-1.0-x86-gcc4-2010-10-20.zip ;
+
+if $(TARGET_ARCH) != x86 {
+	Echo "EtPan not available for $(TARGET_ARCH)" ;
+} else {
+	local etpan_package ;
+	if $(HAIKU_GCC_VERSION[1]) = 2 {
+		etpan_package = $(HAIKU_ETPAN_GCC_2_PACKAGE) ;
+	} else {
+		etpan_package = $(HAIKU_ETPAN_GCC_4_PACKAGE) ;
+	}
+
+	local zipFile = [ DownloadFile $(etpan_package)
+		: $(baseURL)/$(etpan_package) ] ;
+
+	# zip file and output directory
+	HAIKU_ETPAN_ZIP_FILE = $(zipFile) ;
+	HAIKU_ETPAN_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+		$(etpan_package:B) ] ;
+
+	# extract libraries
+	HAIKU_ETPAN_LIBS = [ ExtractArchive $(HAIKU_ETPAN_DIR)
+		:
+		common/lib/libetpan.a
+		: $(zipFile)
+	] ;
+	HAIKU_ETPAN_HEADERS
+			= [ FDirName $(HAIKU_ETPAN_DIR) common include ] ;
+}
+
+
 # zip file and output directory
 HAIKU_ICU_DEVEL_ZIP_FILE = [ DownloadFile $(HAIKU_ICU_DEVEL_PACKAGE)
 		: $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ] ;
diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index bcf268f5a9..ff655cfc4b 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -12,6 +12,7 @@ OptionalPackageDependencies CDRecord : LibIconv ;
 OptionalPackageDependencies Curl : OpenSSL ;
 OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
 OptionalPackageDependencies Development : DevelopmentBase Perl ;
+OptionalPackageDependencies EtPan : Curl Expat LibIconv OpenSSH ;
 OptionalPackageDependencies GetText : LibIconv ;
 OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
 OptionalPackageDependencies ICU-devel : DevelopmentBase ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index a93eb816bb..0c2854e8b4 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -37,6 +37,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	Development				- more complete dev environment (including autotools)
 #	DevelopmentBase			- basic development environment (gcc, headers, libs,...)
 #	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
@@ -665,6 +666,30 @@ 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 {