diff --git a/net-analyzer/libnasl/Manifest b/net-analyzer/libnasl/Manifest
new file mode 100644
index 000000000..c187e2890
--- /dev/null
+++ b/net-analyzer/libnasl/Manifest
@@ -0,0 +1,4 @@
+AUX libnasl-2.2.9-gentoo.patch 1140 RMD160 35741ea63cccb9369e8e5cf7deecb6284fd081db SHA1 3c7b7b253ebeafa18cddfdd7b049a4824e539ea4 SHA256 1ddeedd3020c65d99c597ccf8ee60ab5c53d51aa914336965cdf51c64647cd89
+AUX libnasl-2.2.9-openssl-1.patch 840 RMD160 1dc2366ce997eee69131982acdd94a351591a806 SHA1 dd540b8a6318022bd94eb333e70425b89bb48985 SHA256 a8d6b18d3e4b75f5265a6e9054058489c2e4c0400e00e2a64c226db8fdbe93f7
+DIST libnasl-2.2.9.tar.gz 366960 RMD160 c7f1d5ebd080ed60cb79838601ada8617ec4b9ec SHA1 b3d9015a54317f6dd66e4148c51e1783534f3b61 SHA256 2d9cebfe69e40963d790295993e096697a0bed37774b66ee8b14e48c2231fa93
+EBUILD libnasl-2.2.9-r1.ebuild 973 RMD160 15e814d99bfa1db68795a7c461d1bc2c428298da SHA1 6e9b552d10284c978667df3cf0af29769391c97b SHA256 d6a07c807adc2241fdaac4992ac56857ad5b5fdd756fd60f8d5859da7123c54d
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch
new file mode 100644
index 000000000..9baf75046
--- /dev/null
+++ b/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch
@@ -0,0 +1,36 @@
+ Makefile      |    2 +-
+ nasl/Makefile |    6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 860653d..82bdf2f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ include nasl.tmpl
+ 
+ all: 
+-	cd nasl && ${MAKE}
++	${MAKE} -C nasl
+ 
+ nasl.tmpl: nasl.tmpl.in configure
+ 	$(SHELL) configure $(CONFIGURE_ARGS)
+diff --git a/nasl/Makefile b/nasl/Makefile
+index c0077e4..f04f96f 100644
+--- a/nasl/Makefile
++++ b/nasl/Makefile
+@@ -97,11 +97,11 @@ cflags :
+ 	@echo "echo \"$(NESSUS_CFLAGS) $(include) $(DEFS) \"" > cflags
+ 	@chmod +x cflags
+ 
+-nasl : cflags $(OBJS) nasl.c
+-	$(CC) $(CFLAGS)  $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS) 
++nasl : cflags $(OBJS) nasl.c libnasl.la
++	$(CC) $(CFLAGS) $(LDFLAGS) $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS) 
+ 
+ libnasl.la : cflags $(OBJS)
+-	$(COMPILE) $(NESSUS_LIBS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
++	$(COMPILE) $(NESSUS_LIBS) $(LDFLAGS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
+ 	-version-info ${PACKAGE_VERSION}
+ 
+ install : libnasl.la nasl
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch
new file mode 100644
index 000000000..7d620256a
--- /dev/null
+++ b/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch
@@ -0,0 +1,45 @@
+http://bugs.gentoo.org/326545
+
+--- nasl/nasl_crypto.c
++++ nasl/nasl_crypto.c
+@@ -22,7 +22,9 @@
+   */
+ #include <includes.h>
+ #ifdef HAVE_SSL
++#ifdef HAVE_OPENSSL_MD2_H
+ #include <openssl/md2.h>
++#endif
+ #include <openssl/md4.h>
+ #include <openssl/md5.h>
+ #include <openssl/ripemd.h>
+@@ -45,6 +47,7 @@
+ 
+ 
+ /*-------------------[  Std. HASH ]-------------------------------------*/
++#ifdef HAVE_OPENSSL_MD2_H
+ tree_cell * nasl_md2(lex_ctxt * lexic)
+ {
+  char * data = get_str_var_by_num(lexic, 0);
+@@ -63,6 +66,7 @@
+  retc->size = MD2_DIGEST_LENGTH;
+  return retc;
+ }
++#endif
+ 
+ tree_cell * nasl_md4(lex_ctxt * lexic)
+ {
+@@ -192,12 +196,12 @@
+  return retc;
+ }
+ 
+-
++#ifdef HAVE_OPENSSL_MD2_H
+ tree_cell * nasl_hmac_md2(lex_ctxt * lexic)
+ {
+  return nasl_hmac(lexic, EVP_md2());
+ }
+-
++#endif
+ 
+ tree_cell * nasl_hmac_md5(lex_ctxt * lexic)
+ {
diff --git a/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild b/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
new file mode 100644
index 000000000..d237a9dd2
--- /dev/null
+++ b/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild,v 1.1 2011/04/20 07:52:55 jlec Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A remote security scanner for Linux (libnasl)"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+DEPEND="=net-analyzer/nessus-libraries-${PVR}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	tc-export CC
+	epatch \
+		"${FILESDIR}"/${P}-openssl-1.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+	sed \
+		-e "/^LDFLAGS/s:$:${LDFLAGS}:g" \
+		-i nasl.tmpl.in
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-shared
+}
+
+src_compile() {
+	# emake fails for >= -j2. bug #16471.
+	emake -C nasl cflags
+	emake
+}