diff --git a/net-analyzer/ssltest/Manifest b/net-analyzer/ssltest/Manifest
index 16b085c0b..057ffc143 100644
--- a/net-analyzer/ssltest/Manifest
+++ b/net-analyzer/ssltest/Manifest
@@ -1,2 +1,4 @@
+AUX ssltest-friendly500.patch 1230 RMD160 d292622c92be88994fdcebbb7957b2cf2c7adeb0 SHA1 80bf1dbd8cff1581251d42dc50c2017cd17deb2e SHA256 636d909a80f6cc46bce78a42827b41425555a72b006672451b5de545c7ca92e0
 DIST ssltest-0.4.pl 20630 RMD160 572e120cbd445b01bc535797121b8dae343f16fb SHA1 cc08589121642053de14ae7f425b1ad1c8433d45 SHA256 81fb3b417143752a49bf4b3db15c078a4719376d30a2a145b354fe059f22e1d5
+EBUILD ssltest-0.4-r1.ebuild 698 RMD160 923827ee231db864b8db99bcef91f38332a7980d SHA1 492c2fc003a529c25676f0b3a6ec94d9c8098157 SHA256 f4ad8f91951314d1b994251981e17ab8417e59aab9219ca1524b1ca1995a0c9e
 EBUILD ssltest-0.4.ebuild 617 RMD160 f975b7e64a4897911f0649f0394d15610de96b85 SHA1 6806f0c173e46caac77bf61e839f3870b2083f2f SHA256 8539952a73a7795b8d48d57598c29d455002677ac2969045f83060a7879feaaf
diff --git a/net-analyzer/ssltest/files/ssltest-friendly500.patch b/net-analyzer/ssltest/files/ssltest-friendly500.patch
new file mode 100644
index 000000000..ab3e08a16
--- /dev/null
+++ b/net-analyzer/ssltest/files/ssltest-friendly500.patch
@@ -0,0 +1,26 @@
+--- ssltest.orig	2011-11-15 16:42:42.910055002 +0800
++++ ssltest	2011-11-15 16:41:48.193055001 +0800
+@@ -45,7 +45,8 @@
+ $pcistring = '^NULL|^ADH-|DES-CBC-|^EXP-'; # No NULL cipher, No Null Auth, No single DES, No Export encryption
+ 
+ # search strings to find to detect friendly "update your browser" responses
+-$friendlystring = '^HTTP/1.1 401 Unauthorized';
++$friendlystring1 = '^HTTP/1.1 401 Unauthorized';
++$friendlystring2 = '^HTTP/1.1 500 Internal Server Error';
+ $friendlydetected = 0;
+ 
+ GetOptions('h|help' => \$help, 'v|verbose+' => \$verbose, 'r|ssl2' => \$ssl2, 's|ssl3' => \$ssl3, 't|tls1' => \$tls1, 'x|timeout=i' => \$timeout, 'i|ism' => \$ism, 'p|pci' => \$pci, 'g|grep' => \$grep, 'l|list' => \$list, 'f|friend' => \$friend, 'n|nohelp' => \$nohelp);
+@@ -192,7 +193,12 @@
+       $n = "=" x 40;
+       print "\n$n\nHTTP Request:\n$n\n$httprequest$n\nHTTP Response:\n$n\n$response\n$n\n\n";
+     }
+-    if ($response =~ m/($friendlystring)/) {
++    if ($response =~ m/($friendlystring1)/) {
++      unsupported($_[0], $_[1], $_[2]);
++      $friendlydetected = 1;
++      return;
++    }
++    if ($response =~ m/($friendlystring2)/) {
+       unsupported($_[0], $_[1], $_[2]);
+       $friendlydetected = 1;
+       return;
diff --git a/net-analyzer/ssltest/ssltest-0.4-r1.ebuild b/net-analyzer/ssltest/ssltest-0.4-r1.ebuild
new file mode 100644
index 000000000..d9f196797
--- /dev/null
+++ b/net-analyzer/ssltest/ssltest-0.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="SSL testing tool written in perl"
+HOMEPAGE="http://sites.google.com/site/lupingreycorner/"
+SRC_URI="http://sites.google.com/site/lupingreycorner/${P}.pl"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/IO-Socket-SSL"
+
+S="${WORKDIR}"/${PN}
+
+src_unpack() {
+	einfo "Nothing to unpack"
+	mkdir "${S}"
+	cp "${DISTDIR}"/"${P}".pl "${S}"/ssltest
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${PN}"-friendly500.patch
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	dobin ssltest || die "install failed"
+}