diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
new file mode 100644
index 0000000..c28439b
--- /dev/null
+++ b/mail-client/squirrelmail/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for mail-client/squirrelmail
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*squirrelmail-1.5.2_p20121030.ebuild (30 Oct 2012)
+
+  30 Oct 2012; Torsten Kurbad <gentoo@tk-webart.de>
+  +squirrelmail-1.5.2_p20121030.ebuild, +metadata.xml,
+  +files/ldapuserdata-0.4-gentoo.patch,
+  +files/postinstall-en.txt:
+  Initial ebuild for snapshot version.
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
new file mode 100644
index 0000000..70ac348
--- /dev/null
+++ b/mail-client/squirrelmail/Manifest
@@ -0,0 +1,15 @@
+AUX ldapuserdata-0.4-gentoo.patch 709 SHA256 bff9cf8e7518df983b03b3f4e7f10fcf31fb75f6d73afb21c8923f2a8312b4a3 SHA512 a3106d3dcf4cbd8ed194842f3a131feacae78152a83b447661e17a107843d3d90e3c29601fabdb7fdbe241c0f42fde20bbce56afe88d69ef17d7d8df19a48749 WHIRLPOOL 5630a393598f0401b1ea06a7c42d9441d8bb085a8826055b8968a5123ea7e5e29074999f28e0b5183a7af2105d4834dd13bb3fc4ef1c106bbc14521db01814b1
+AUX postinstall-en.txt 698 SHA256 4e3702651bb5cce4cc517a2b2bed3e71b137167645138bc72c0cedab4ba98da3 SHA512 2d01b8295ed88909bd8e1889e39655e7f9c8d284f691fca7823f4139bc74900d26af20f2df0e3c9b19a5ad3db0cfd13aef56fea91264ce86d1ef0369ade9c645 WHIRLPOOL cd1ba8c1d776ec7a9133d782898bd5fe6d8769103ff3b84beccdb0321f4ead0ae9dfc8b2b84f5fb35e86efd6940cf5b0a7b54ffdab42dfe9596256b4e99dcfae
+DIST admin_add.0.1-1.4.0.tar.gz 2388 SHA256 25ec999eea098a509f7d49cfe368b0557b64c698f86b2a2c951617f67735dabc SHA512 c8abb5a29b815ad2a4591ed965d60d1f75deea17d64c5eaa85ba4fec11d7d1ac1aa5beb8d39228e02b1377782d507b0fb55c47bb8ad10b9b958af8c207c6b627 WHIRLPOOL 94d26bd55e1e859f583db0cd39e4ae9b1ef778139302a24af1a10a671b44989354180c837e9eb74b0d58cef0adb345e65a2421c7777ddf77bcb48795133ce534
+DIST amavisnewsql-0.8.0-1.4.tar.gz 101008 SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c
+DIST compatibility-2.0.16-1.0.tar.gz 41497 SHA256 bf179d29223fc76ff6609fdf5146d8f488c603314a343ef70e41f77267de0261 SHA512 478b921da90679022da8790183a651c91bcc879e2ec42db9982e3fef7d3f7e92cd23703ac81a7e8e465889348b28597feba8aaa60943cdbe518a076c4723cf3c WHIRLPOOL 6248e48123484d29c299f88485342b612ecfd72f1ea21a67e988b8d379fcc54bc1262095ed75a3ee238bc60e527d5177e1252a370d0e32f0640b227a4e5e69c2
+DIST ldapuserdata-0.4.tar.gz 67439 SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 SHA512 89cb6740865a6b48dbdae8b6ded49bfdac1946f0a76538dd874db104d01ddbbd022f1819a7f94d9ade599d9583dc4b4a1e3f4981bdd6d3dbd86c673bb1d388ac WHIRLPOOL 0c69741b1abbdd51dad33e284fafe148e29c66e6fe20351763bee1d400f980a52ec95eb59d6d9a10afa1a4baf1e7d27843c3b51ccd296c1eae47723cee4ff5ab
+DIST retrieveuserdata.0.9-1.4.0.tar.gz 10448 SHA256 086796d858e781c518b538b37e9ec011d51a2aebd6d14aeba1aa330b58626b8d SHA512 77588d0dafc603837cff7c33f8e487ee9b322d9ba875077fce1c5ef85b6e57fe9239680f1b9cf805e0940ae4f1a34c0dcd03e3d26706ac44732ea679ccaf8896 WHIRLPOOL b0121dac6146659fce80b9653084b92efb44fb4cc5ee986ebde91c46e581a721c775c8791e5f38bad10fba5b2369ab0f9e72c8749eeec102d1006a93e5f9d13a
+DIST secure_login-1.4-1.2.8.tar.gz 16993 SHA256 b6ede807a79c9b5300b43565c920570c583a1cc4d339bcea715c32196518837e SHA512 3246bf3e3f058d73e33a3f2e33166aa57061be0210fcc939f3a881bdb569d049fb95d8ad5c141de9ff7f2014feff40bcc5c72f4ca9acf9c30937c484977e15db WHIRLPOOL 86e5361ec0e0df994c2bd80346fc54126f77d463f642bb23e1fa39daf31488d2abab71cf81c8b290059e9acba1032b160b87a2d92f1295fb6b8b0ee22a477707
+DIST show_ssl_link-2.2-1.2.8.tar.gz 13193 SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a SHA512 5e2579a6d55924e5b92ee558379e88f7a5ffd4702009fa00c9a99a2a5bec750cf7b1de7b78ac05c0cdb5f59248c73bde15404e8b27a408766c96fc24ecc4b9c8 WHIRLPOOL d99dc6a04ef026b3faf8029b695ad5bb374009c1e19866661f3b32f5d2b46f27e231cd82f59130cbd15ca3caac3496b132b8c79b5229f5ed558b05e8743e7b8e
+DIST squirrelmail-20121030_0200-SVN.devel.tar.bz2 1118033 SHA256 3a7ef7f03e0b2aea590c98072a0e53e602720345a391768d1c9150194e7e9ebc SHA512 4912acb850edc8d21836bf54e253ebd6818f3abc980653ef5aac5c0b7f5e0d19c21efe1589a52f1d46cb0c765c96ff1e9411e4da853b35b71ad87f487f1ed6fc WHIRLPOOL f05c7ee751220a5a8edfd4ca3cd3bdb1361797aeddafe7a7ff800cf3f57b4a03832d74d6bc158743f44a41858b319ec87dcef3ee407ada928a3af4647b83a675
+DIST squirrelmail-20121030_0202-SVN.locales.tar.bz2 5254174 SHA256 ab8a1de6efaeb5e07cd8205cf03d6bc2d7034a2d4ca9c699e2f615367a86d3e1 SHA512 84bc80b9b4ec99afaad14f551de44f8ad3e266b77ea8a01549dfb236599ca0cc43ed29d89daa2404202ec32bb9170f945973afa9d30f608556bcaefe3349f4f9 WHIRLPOOL 146c3954e511eae856bca61e6ae345a1c37875b625e79d0d09aba7b82d1acd3e94936b7f28bc80c18105c4410e15b2b018fb0d8a21ffb7efa80fbdb77b28d064
+DIST squirrelmail-decode-1.2.tar.bz2 333942 SHA256 72750301b83ee23fffe32ae40a3dec33ad4f39abf81c5abdd38f235aab3fcb26 SHA512 f804d7e4bf8814fc00ea076b388a106820df6cb22e0d6c76305fef414f159238578a31e13787a932f9e832dc4b31eb4a7ef5da481f2abbcb164b81673e68698b WHIRLPOOL 735695b9f78068542b1db65cb1d35c06eb5c7d94b699fb176d6c5c82cb2b2f38725a83c6bff355ec7035916a55493666e5f839356369b923d2a6b8f9bd5688da
+EBUILD squirrelmail-1.5.2_p20121030.ebuild 5770 SHA256 94f226e5b83568a38fb7477e07849a1c26f6dd7181b9e3845ec50023e34e376c SHA512 897a590f888ce8f1e1eb80bc7cfa7ea759c7770aa21995d189844921427df5a08d9293b8964e165b3ddb8ef88fd78d84d800d1a8a819a695d4721fbf1e5dc9de WHIRLPOOL 868eeabda4c7b56a170978e057c5a870651e4ea7b390ae0480c1cbaca292b7f6f7ef44f92e750069115f6f27b64c9e52fa6cff87266791b6741ba0d6ca754cf7
+MISC ChangeLog 392 SHA256 538bcf1cb0f8fa1319b9a4c378696c82d1b3a5ea221abcb9edaf7aa2c5d7d362 SHA512 ee8f03176cdd9714d8ee2cfc5d829c33540d2cdb49ab06f3998c3d28f99d48fbe565e56aa6b8958b3b948d06531db4504cea5e04dd6390bd3879372a2f294d9b WHIRLPOOL 9e31895266ebe6e3cab1b6dc6aef8fbf97a2ea6dcb9ca5fff5f01583617a3d24c1a81d9a46e019913eeac60de370563b6efa663d84412e0d52d5167bac5a7b10
+MISC metadata.xml 258 SHA256 21af48d333e86033571fce6541ff71f04d5172b3e807e711171d8a17208bc6a7 SHA512 3ac2bf8bc4223a24b4a79e267531b0f3e34a9d58432e8752ad91850e8c448ac66f9892080f190a1551b76b859875a807156cb4c96463cf0fa3204bf6a565db9f WHIRLPOOL aad34ee6e120081d7cbd90ca1d2b1b81f6c4931f3ddd939e14f94219c043f9abfe4b951017add31baebf87cb0cf3947a417975a819c3f0fc9ce597b9b56b336f
diff --git a/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch b/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch
new file mode 100644
index 0000000..46ebc04
--- /dev/null
+++ b/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch
@@ -0,0 +1,20 @@
+--- plugins/ldapuserdata/setup.php.orig	2004-01-15 23:40:41.000000000 -0800
++++ plugins/ldapuserdata/setup.php	2004-01-15 23:40:52.000000000 -0800
+@@ -92,7 +92,7 @@
+ 	global $ldap_bind_dn, $ldap_host;
+ 
+ 	/* fill $ldap_prefs_cache with data from LDAP. */
+-	$ldap_prefs_cache = retrieve_data($login_username);
++	$ldap_prefs_cache = ldap_retrieve_data($login_username);
+ 
+ 	/*
+ 	print "<pre>";
+@@ -121,7 +121,7 @@
+ }
+ 
+ 
+-function retrieve_data ($uid) {
++function ldap_retrieve_data ($uid) {
+ 	global $ldap_host, $username, $ldap_base_dn, $ldap_bind_dn, $ldap_bind_pw;
+ 	global $ldap_manager_dn, $ldap_manager_pw;
+ 	global $ldap_objectclass, $prefs_default, $ldap_attributes, $boolean_attrs, $multivalue_attrs;
diff --git a/mail-client/squirrelmail/files/postinstall-en.txt b/mail-client/squirrelmail/files/postinstall-en.txt
new file mode 100644
index 0000000..dc9c64a
--- /dev/null
+++ b/mail-client/squirrelmail/files/postinstall-en.txt
@@ -0,0 +1,18 @@
+ * You must edit the following configuration files to setup your server.
+ * Note that not all of them may be present depending on USE flags.
+ * 
+ * config/config.php
+ * plugins/retrieveuserdata/config.php
+ * plugins/virus_scan/config.php
+ * plugins/gpg/gpg_local_prefs.txt
+ * plugins/ldapuserdata/config.php
+ * plugins/show_ssl_link/config.php
+ * plugins/secure_login/config.php
+ * 
+ * You should also create the file 'config/admins'
+ * containing the users who should have access to administrative options.
+ * Put each login on its own line, and be sure to leave a newline at the
+ * end of the file.
+ * 
+ * You can use the console based configuration tool by executing:
+ * cd config; perl conf.pl
diff --git a/mail-client/squirrelmail/metadata.xml b/mail-client/squirrelmail/metadata.xml
new file mode 100644
index 0000000..39f5a22
--- /dev/null
+++ b/mail-client/squirrelmail/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<use>
+	<flag name='filter'>Enable <pkg>mail-filter/amavisd-new</pkg>
+		filtering
+	</flag>
+</use>
+</pkgmetadata>
diff --git a/mail-client/squirrelmail/squirrelmail-1.5.2_p20121030.ebuild b/mail-client/squirrelmail/squirrelmail-1.5.2_p20121030.ebuild
new file mode 100644
index 0000000..1435d7b
--- /dev/null
+++ b/mail-client/squirrelmail/squirrelmail-1.5.2_p20121030.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit webapp eutils
+
+IUSE="ldap spell ssl filter mysql postgres nls"
+DESCRIPTION="Webmail for nuts!"
+
+MY_PV="${PV/1.5.2_p/}_0200-SVN"
+
+# Plugin Versions
+COMPATIBILITY_VER=2.0.16-1.0
+USERDATA_VER=0.9-1.4.0
+ADMINADD_VER=0.1-1.4.0
+AMAVIS_VER=0.8.0-1.4
+LDAP_USERDATA_VER=0.4
+SECURELOGIN_VER=1.4-1.2.8
+SHOWSSL_VER=2.2-1.2.8
+LOCALES_VER="${PV/1.5.2_p/}_0202-SVN"
+DECODING_VER=1.2
+
+MY_P=${PN}-${MY_PV}
+S="${WORKDIR}/${PN}.devel/${PN}"
+
+PLUGINS_LOC="http://www.squirrelmail.org/plugins"
+SRC_URI="http://snapshots.squirrelmail.org/${MY_P}.devel.tar.bz2
+	mirror://sourceforge/${PN}/squirrelmail-decode-${DECODING_VER}.tar.bz2
+	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
+	${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
+	ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
+	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
+	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
+	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
+	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
+	nls? ( http://snapshots.squirrelmail.org/${PN}-${LOCALES_VER}.locales.tar.bz2 )"
+
+HOMEPAGE="http://www.squirrelmail.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+
+RDEPEND="dev-lang/php[session]
+	virtual/perl-DB_File
+	ldap? ( net-nds/openldap )
+	spell? ( app-text/aspell )
+	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
+	postgres? ( dev-php/PEAR-DB )
+	mysql? ( dev-php/PEAR-DB )"
+
+src_unpack() {
+	unpack ${MY_P}.devel.tar.bz2
+	unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
+
+	cd "${S}" || die
+
+	mv config/config_default.php config/config.php || die
+
+	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" config/config.php || die
+
+	# Now do the plugins
+	cd "${S}/plugins"
+
+	sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin."
+
+	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
+
+	unpack admin_add.${ADMINADD_VER}.tar.gz
+
+	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
+
+	use filter &&
+		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
+		mv amavisnewsql/config.php.dist amavisnewsql/config.php
+
+	use ldap &&
+		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz
+
+	use ssl &&
+		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
+		mv secure_login/config.sample.php secure_login/config.php &&
+		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
+		mv show_ssl_link/config.php.sample show_ssl_link/config.php
+
+	use nls &&
+		cd "${S}" &&
+		unpack ${PN}-${LOCALES_VER}.locales.tar.bz2
+}
+
+src_prepare() {
+	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" \
+		config/config.php || die
+
+	cd "${S}/plugins" || die
+	if use ldap; then
+		epatch "${FILESDIR}"/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch
+		mv ldapuserdata/config_sample.php ldapuserdata/config.php || die
+	fi
+}
+
+src_configure() {
+	#we need to have this empty function ...
+	echo "Nothing to configure"
+}
+
+src_compile() {
+	#we need to have this empty function ... default compile hangs
+	echo "Nothing to compile"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	dodoc README
+
+	docinto compatibility
+	for doc in plugins/compatibility/docs/INSTALL plugins/compatibility/docs/README; do
+		dodoc ${doc}
+		rm -f ${doc}
+	done
+
+	docinto admin_add
+	for doc in plugins/admin_add/README; do
+		dodoc ${doc}
+		rm -f ${doc}
+	done
+
+	docinto retrieveuserdata
+	for doc in plugins/retrieveuserdata/INSTALL plugins/retrieveuserdata/changelog plugins/retrieveuserdata/users_example.txt; do
+		dodoc ${doc}
+		rm -f ${doc}
+	done
+
+	if use filter; then
+		docinto amavisnewsql
+		for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+	fi
+
+	if use ldap; then
+		rm plugins/ldapuserdata/README
+		docinto ldapuserdata
+		for doc in plugins/ldapuserdata/doc/README; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+	fi
+
+	if use ssl; then
+		docinto secure_login
+		for doc in plugins/secure_login/INSTALL plugins/secure_login/README; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+
+		docinto show_ssl_link
+		for doc in plugins/show_ssl_link/INSTALL plugins/show_ssl_link/README; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+	fi
+
+	# Copy the app's main files
+	einfo "Installing squirrelmail files."
+	cp -r . "${D}${MY_HTDOCSDIR}" || die
+
+	cp "${WORKDIR}"/squirrelmail-decode-${DECODING_VER}/*/*.php \
+		"${D}${MY_HTDOCSDIR}/functions/decode" || die
+
+	# Identify the configuration files that this app uses
+	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
+	use filter && configs="${configs} plugins/amavisnewsql/config.php"
+	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
+	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
+
+	for file in ${configs}; do
+		webapp_configfile ${MY_HTDOCSDIR}/${file}
+	done
+
+	# Identify any script files that need #! headers adding to run under
+	# a CGI script (such as PHP/CGI)
+	#
+	# for phpmyadmin, we *assume* that all .php files that don't end in
+	# .inc.php need to have CGI/BIN support added
+
+	#for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
+	#	webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
+	#done
+
+	mkdir -p "${D}${MY_HTDOCSDIR}"/data
+
+	local server_owned="data index.php"
+	for file in ${server_owned}; do
+		webapp_serverowned ${MY_HTDOCSDIR}/${file}
+	done
+
+	# add the post-installation instructions
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+
+	# all done
+	#
+	# now we let the eclass strut its stuff ;-)
+
+	webapp_src_install
+}