diff --git a/srcpkgs/libdwarf/template b/srcpkgs/libdwarf/template
index dfc5081d847..6ec7b72d310 100644
--- a/srcpkgs/libdwarf/template
+++ b/srcpkgs/libdwarf/template
@@ -1,20 +1,19 @@
 # Template file for 'libdwarf'
 pkgname=libdwarf
-version=20180527
+version=20180809
 revision=1
-wrksrc="dwarf-${version}"
-build_wrksrc=libdwarf
 build_style=gnu-configure
 configure_args="--prefix=/usr --enable-shared"
 makedepends="elfutils-devel"
 short_desc="DWARF Debugging Information Format Library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="LGPL-2.1-only"
-homepage="http://www.prevanders.net/dwarf.html"
-distfiles="http://prevanders.net/${pkgname}-${version}.tar.gz"
-checksum=47e014211f3cfef54a78e8f6dea0b211c4825724871361adf39d9706eb9b0f1f
+homepage="https://www.prevanders.net/dwarf.html"
+distfiles="https://prevanders.net/${pkgname}-${version}.tar.gz"
+checksum=63e5947fbd8f342240d25bed2081251f8ec5428ee09e24dfad3b6956168bc400
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" elfutils-devel"
 	make_cmd="make HOSTCC=cc HOSTCFLAGS=-I./ HOSTLDFLAGS="
 
 	pre_build() {
@@ -23,28 +22,25 @@ if [ "$CROSS_BUILD" ]; then
 	}
 fi
 
-do_install() {
-	install -dm755 $DESTDIR/usr/lib
-	install -m644 libdwarf.so $DESTDIR/usr/lib/
+post_install() {
+	rm -rf ${PKGDESTDIR}/usr/share/libdwarf/libdwarf-devel
 }
 
 libdwarf-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		install -dm755 $PKGDESTDIR/usr/lib
-		install -m644 libdwarf.a $PKGDESTDIR/usr/lib
-
-		install -dm755 $PKGDESTDIR/usr/include/libdwarf
-		install -m644 libdwarf.h $PKGDESTDIR/usr/include/libdwarf/
-		install -m644 dwarf.h $PKGDESTDIR/usr/include/libdwarf/
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
 	}
 }
 
 libdwarf-doc_package() {
+	noarch=yes
 	short_desc+=" - documentation"
 	pkg_install() {
 		install -dm755 $PKGDESTDIR/usr/share/doc/${pkgname}
-		install -m644 README NEWS *.pdf $PKGDESTDIR/usr/share/doc/${pkgname}
+		install -m644 README NEWS libdwarf/*.pdf $PKGDESTDIR/usr/share/doc/${pkgname}
 	}
 }