diff --git a/srcpkgs/libdwarf/patches/hostcflags.patch b/srcpkgs/libdwarf/patches/hostcflags.patch
new file mode 100644
index 00000000000..b9435f2613e
--- /dev/null
+++ b/srcpkgs/libdwarf/patches/hostcflags.patch
@@ -0,0 +1,11 @@
+--- libdwarf/Makefile.in.orig	2016-05-01 21:26:23.000000000 +0200
++++ libdwarf/Makefile.in	2016-05-08 06:29:07.344055712 +0200
+@@ -56,7 +56,7 @@
+ dwfzlib =       @dwfzlib@
+ CFLAGS =	$(PREINCS) @CFLAGS@ $(INCLUDES) $(dwfpic) $(dwfwall)  $(POSTINCS)
+ LDFLAGS =	$(PRELIBS) @LDFLAGS@ $(POSTLIBS)
+-HOSTCFLAGS =	$(INCLUDES) 
++HOSTCFLAGS =	$(INCLUDES) @CFLAGS@ $(dwfpic)
+ HOSTLDFLAGS =	$(PRELIBS) @LDFLAGS@ 
+ 
+ # These three files are only appropriate for SGI IRIX.
diff --git a/srcpkgs/libdwarf/patches/swf_compressed.patch b/srcpkgs/libdwarf/patches/swf_compressed.patch
new file mode 100644
index 00000000000..c8c68b56d2d
--- /dev/null
+++ b/srcpkgs/libdwarf/patches/swf_compressed.patch
@@ -0,0 +1,13 @@
+--- libdwarf/libdwarfdefs.h.orig	2016-05-08 06:57:38.557143992 +0200
++++ libdwarf/libdwarfdefs.h	2016-05-08 06:57:53.646144771 +0200
+@@ -84,10 +84,4 @@
+ #define  UNUSEDARG
+ #endif
+ 
+-#ifndef SHF_COMPRESSED
+-/*  This from ubuntu xenial. Is in top of trunk binutils
+-    as of February 2016. Elf Section Flag */
+-#define SHF_COMPRESSED (1 << 11)
+-#endif
+-
+ #endif /* LIBDWARFDEFS_H */
diff --git a/srcpkgs/libdwarf/template b/srcpkgs/libdwarf/template
index bc045d4f611..b6add421b70 100644
--- a/srcpkgs/libdwarf/template
+++ b/srcpkgs/libdwarf/template
@@ -1,8 +1,8 @@
 # Template build file for 'libdwarf'
 pkgname=libdwarf
-version=20160115
+version=20160507
 revision=1
-build_style=configure
+build_style=gnu-configure
 configure_args="--prefix=/usr --enable-shared"
 short_desc="DWARF Debugging Information Format Library"
 maintainer="John Regan <john@jrjrtech.com>"
@@ -10,18 +10,12 @@ license="GPL-2, LGPL-2.1"
 makedepends="elfutils-devel"
 homepage="http://www.prevanders.net/dwarf.html"
 distfiles="http://prevanders.net/${pkgname}-${version}.tar.gz"
-checksum=e8daf303181953751f0a4761b6b05a238e802635e08d7fc837e446e26b212f33
+checksum=12ae39376e3915bf8fa92555989f3ad5f2f4f332b590a628541ce68987b337af
 wrksrc="dwarf-${version}"
 build_wrksrc="libdwarf"
 nocross="yes"
 # XXX need to fix cross-compile
 
-export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-
-do_build() {
-	make
-}
-
 do_install() {
 	install -dm755 $DESTDIR/usr/lib
 	install -m644 libdwarf.so $DESTDIR/usr/lib/