diff --git a/common/shlibs b/common/shlibs
index 00181bae5fa..01447ca81b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -592,8 +592,9 @@ libopenmpi_malloc.so.0 openmpi-1.4.1_1
 libopen-pal.so.0 openmpi-1.4.1_1
 libopen-rte.so.0 openmpi-1.4.1_1
 libmtp.so.9 libmtp-1.1.4_1
-libelf-0.8.13.so libelf-0.8.13_1
-libelf.so.0 libelf-0.8.13_1
+libelf.so.1 libelf-0.155_1
+libdw.so.1 libelf-0.155_1
+libasm.so.1 libelf-0.155_1
 libgtksourceview-3.0.so.0 gtksourceview-3.0.0_1
 libtalloc.so.1 talloc-2.0.1_1
 libtalloc.so.2 talloc-2.0.1_1
diff --git a/srcpkgs/elfutils-devel b/srcpkgs/elfutils-devel
new file mode 120000
index 00000000000..b76b36cfac4
--- /dev/null
+++ b/srcpkgs/elfutils-devel
@@ -0,0 +1 @@
+elfutils
\ No newline at end of file
diff --git a/srcpkgs/elfutils/elfutils-devel.template b/srcpkgs/elfutils/elfutils-devel.template
new file mode 100644
index 00000000000..dd5e2d8b1ff
--- /dev/null
+++ b/srcpkgs/elfutils/elfutils-devel.template
@@ -0,0 +1,13 @@
+# Template file for 'elfutils-devel'.
+#
+noarch=yes
+replaces="libelf-devel>=0"
+depends="libelf-${version}_${revision}"
+short_desc="${short_desc} -- development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+do_install() {
+	vmove usr/include usr
+}
diff --git a/srcpkgs/elfutils/elfutils.rshlibs b/srcpkgs/elfutils/elfutils.rshlibs
new file mode 100644
index 00000000000..589bcf9a3a4
--- /dev/null
+++ b/srcpkgs/elfutils/elfutils.rshlibs
@@ -0,0 +1,6 @@
+libelf.so.1
+libdw.so.1
+libc.so.6
+libdl.so.2
+libstdc++.so.6
+libasm.so.1
diff --git a/srcpkgs/elfutils/libelf.rshlibs b/srcpkgs/elfutils/libelf.rshlibs
new file mode 100644
index 00000000000..3c53ae7701e
--- /dev/null
+++ b/srcpkgs/elfutils/libelf.rshlibs
@@ -0,0 +1,6 @@
+libc.so.6
+ld-linux-x86-64.so.2
+libdl.so.2
+liblzma.so.5
+libbz2.so.1
+libz.so.1
diff --git a/srcpkgs/elfutils/libelf.template b/srcpkgs/elfutils/libelf.template
new file mode 100644
index 00000000000..4a056002a4f
--- /dev/null
+++ b/srcpkgs/elfutils/libelf.template
@@ -0,0 +1,11 @@
+# Template file for 'isl-devel'.
+#
+short_desc="${short_desc} -- runtime library"
+long_desc="${long_desc}
+
+ This package contains the runtime shared library."
+
+do_install() {
+	vmove "usr/lib/*.so*" usr/lib
+	vmove usr/lib/elfutils usr/lib
+}
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
new file mode 100644
index 00000000000..3ecc09ed6ad
--- /dev/null
+++ b/srcpkgs/elfutils/template
@@ -0,0 +1,21 @@
+# Template file for 'elfutils'
+pkgname=elfutils
+version=0.155
+revision=1
+subpackages="libelf ${pkgname}-devel"
+build_style=gnu-configure
+configure_args="--program-prefix=eu-"
+makedepends="liblzma-devel"
+short_desc="Utilities to handle ELF object files"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-3"
+homepage="https://fedorahosted.org/elfutils/"
+distfiles="https://fedorahosted.org/releases/e/l/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
+checksum=68444a4526416ffd68852ec3c6a40ceddcca46538297322405319884c5d30ed8
+long_desc="
+ Sed, the GNU Stream Editor, copies the named files (standard input default)
+ to the standard output, edited according to a script of commands."
+
+post_install() {
+	rm -f ${DESTDIR}/usr/lib/*.a
+}
diff --git a/srcpkgs/libelf b/srcpkgs/libelf
new file mode 120000
index 00000000000..b76b36cfac4
--- /dev/null
+++ b/srcpkgs/libelf
@@ -0,0 +1 @@
+elfutils
\ No newline at end of file
diff --git a/srcpkgs/libelf-devel b/srcpkgs/libelf-devel
deleted file mode 120000
index 6e3ed115de7..00000000000
--- a/srcpkgs/libelf-devel
+++ /dev/null
@@ -1 +0,0 @@
-libelf
\ No newline at end of file
diff --git a/srcpkgs/libelf/libelf-devel.template b/srcpkgs/libelf/libelf-devel.template
deleted file mode 100644
index 0cb1e4791d9..00000000000
--- a/srcpkgs/libelf/libelf-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'libelf-devel'.
-#
-depends="glibc-devel libelf"
-short_desc="${sourcepkg} - development files"
-long_desc="${long_desc}
-
- This package contains files for development: headers, static libs, etc."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libelf/libelf.rshlibs b/srcpkgs/libelf/libelf.rshlibs
deleted file mode 100644
index 631aa1dda40..00000000000
--- a/srcpkgs/libelf/libelf.rshlibs
+++ /dev/null
@@ -1 +0,0 @@
-libc.so.6
diff --git a/srcpkgs/libelf/template b/srcpkgs/libelf/template
deleted file mode 100644
index 77e58778045..00000000000
--- a/srcpkgs/libelf/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template build file for 'libelf'
-pkgname=libelf
-version=0.8.13
-distfiles="http://www.mr511.de/software/$pkgname-$version.tar.gz"
-build_style=gnu-configure
-configure_args="--enable-gnu-names --enable-compat --enable-shared"
-make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version/usr install"
-revision=2
-short_desc="ELF object file access library"
-maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d
-long_desc="
- The elf library provides routines to access, and manipulate, Elf object files.
- It is still not complete, but is required for a number of programs, such as
- Eli (a state of the art compiler generation system), and Elk (the Extension
- Language Kit - an implementation of the Scheme programming language.)"
-
-subpackages="$pkgname-devel"