diff --git a/dev-libs/libavl/Manifest b/dev-libs/libavl/Manifest
new file mode 100644
index 0000000..ba87ba4
--- /dev/null
+++ b/dev-libs/libavl/Manifest
@@ -0,0 +1,2 @@
+DIST libavl_0.3.5.orig.tar.gz 14642 RMD160 55db560fc1e8137c5153d59a95ce322f456782ae SHA1 6e0226160980ec3e9a023e582026560f7e88d200 SHA256 4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0
+EBUILD libavl-0.3.5.ebuild 608 RMD160 aa729985c485942f7f7a9c9e6b3683806f33ab2d SHA1 fc74f13eb1f2f3363d66cb8bf4c283aba074fa0e SHA256 5d737a2b5f3e2bc038568e0bd055deadb1fd7454aac13106cb4bdb039025eb31
diff --git a/dev-libs/libavl/libavl-0.3.5.ebuild b/dev-libs/libavl/libavl-0.3.5.ebuild
new file mode 100644
index 0000000..a21b01d
--- /dev/null
+++ b/dev-libs/libavl/libavl-0.3.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit flag-o-matic
+
+DESCRIPTION="Implementation of AVL trees for C"
+HOMEPAGE="http://libavl.sourcearchive.com"
+SRC_URI="http://libavl.sourcearchive.com/downloads/${PV}/libavl_${PV}.orig.tar.gz"
+
+LICENSE="LGPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	append-flags "-fPIC"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dolib libavl.so.1.5 || die
+	dosym libavl.so.1.5 /usr/lib/libavl.so || die
+	dodoc README || die
+	insinto /usr/include
+	doins avl.h || die
+}
diff --git a/sys-libs/libavl/Manifest b/sys-libs/libavl/Manifest
deleted file mode 100644
index 722dbf4..0000000
--- a/sys-libs/libavl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX libavl_0.3.5-3.diff.gz 2652 RMD160 ece32b5b70e0d489c977e0599cbe470b834dc094 SHA1 09001527368e8fbb37de977bd2ba903f377564ce SHA256 6c9e8af8f9fabae516d0f5a000cf44e1b21df67c23f1973e840414442a17698d
-DIST libavl_0.3.5.orig.tar.gz 14642 RMD160 55db560fc1e8137c5153d59a95ce322f456782ae SHA1 6e0226160980ec3e9a023e582026560f7e88d200 SHA256 4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0
-EBUILD libavl-0.3.5-r3.ebuild 695 RMD160 63fb7cab850efdd540a04f4721507be5d2811bc2 SHA1 dd6e7cc8a3bc054d2e154131ca86c78296ab812a SHA256 fd754855ef5b10fdeab2fd8382efb2bf5feb17f451256a6f4afe3a5f23bff266
diff --git a/sys-libs/libavl/files/libavl_0.3.5-3.diff.gz b/sys-libs/libavl/files/libavl_0.3.5-3.diff.gz
deleted file mode 100644
index fe7b389..0000000
Binary files a/sys-libs/libavl/files/libavl_0.3.5-3.diff.gz and /dev/null differ
diff --git a/sys-libs/libavl/libavl-0.3.5-r3.ebuild b/sys-libs/libavl/libavl-0.3.5-r3.ebuild
deleted file mode 100644
index cabc9e1..0000000
--- a/sys-libs/libavl/libavl-0.3.5-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTTON="A small implementation of AVL trees"
-HOMEPAGE="http://ftp.debian.org/debian/pool/main/liba/libavl"
-SRC_URI="http://ftp.debian.org/debian/pool/main/liba/libavl/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="net-misc/curl"
-RDEPEND="${DEPEND}"
-
-RESTRICT="mirror"
-S=${WORKDIR}/avl-${PV}
-
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}_${PV}-3.diff.gz
-}
-
-src_compile() {
-	cd ${S}
-	emake 
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc README || die
-}
-