diff --git a/srcpkgs/hnb/template b/srcpkgs/hnb/template
index f5c1a06d4a..a207c645ee 100644
--- a/srcpkgs/hnb/template
+++ b/srcpkgs/hnb/template
@@ -1,19 +1,22 @@
 # Template file for 'hnb'
 pkgname=hnb
 version=1.9.17
-revision=1
+revision=2
 makedepends="ncurses-devel"
 short_desc="A curses program to structure many kinds of data in one place"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-3"
+license="GPL-2"
 homepage="http://hnb.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/hnb/hnb/${version}/hnb-${version}.tar.gz"
 checksum=c233c00aaef5b7fb93759d7888c885f99f40aec689a7f3e0d5d8b5797bf80cd4
 
+post_extract() {
+	sed -i '/CFLAGS *=/s/$/ $(CCFLAGS)/' src/Makefile src/libcli/Makefile
+	sed -i '/LIBS=/s/$/ $(LDFLAGS)/' src/Makefile
+}
 do_build(){
-	make CC=$CC ${makejobs}
-	cd util
-	make CC=$CC ${makejobs}
+	make -C src ${makejobs} CC="$CC" CCFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+	make -C util ${makejobs} CC="$CC" CCFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
 do_install() {
@@ -22,5 +25,4 @@ do_install() {
 	vdoc doc/Documentation.hnb
 	vdoc doc/Documentation.html
 	vman doc/hnb.1
-	vlicense COPYING
 }