diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index 4cdd89fe8bf42c8a0b3ed66bea5209e45d3706af..9d8bc8cf2471acbabeee5995150832b181938173 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -2,17 +2,17 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=arpwatch
 pkgver=2.1a15
-pkgrel=16
+pkgrel=17
 pkgdesc="Ethernet monitoring program"
 url="http://www-nrg.ee.lbl.gov/"
 arch="all"
-license="BSD"
+license="BSD-4-Clause-Shortened"
 pkgusers="arpwatch"
 makedepends="libpcap-dev"
 install="$pkgname.pre-install"
 options="!check"  # No test suite.
-subpackages="$pkgname-ethercodes"
-source="ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-ethercodes $pkgname-doc"
+source="ftp://ftp.ee.lbl.gov/arpwatch-$pkgver.tar.gz
 	arpwatch.confd
 	arpwatch.initd
 	01_all_arpwatch-2.1a15-manpages.patch
@@ -38,16 +38,14 @@ source="ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz
 	21_all_arpwatch-2.1a15-pid-filename.patch
 	22_alpine_bihourly_script.patch
 	"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
 prepare() {
+	chmod -R u+rwX "$builddir"
 	default_prepare
 	update_config_sub
+	sed -i'' -e 's/-o bin -g bin //g' Makefile.in
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -59,7 +57,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	#make install command wouldn't create directory
 	mkdir -p "$pkgdir"/usr/sbin/
 	make -j1 DESTDIR="$pkgdir" install
@@ -83,8 +80,16 @@ ethercodes() {
 	done
 }
 
-
-
+doc() {
+	cd "$builddir"
+	install -d "$subpkgdir"/usr/share/man/man8
+	make DESTDIR="$subpkgdir" install-man
+	gzip "$subpkgdir"/usr/share/man/man8/*.8
+	install -d "$subpkgdir"/usr/share/doc/$pkgname
+	for f in CHANGES INSTALL README; do
+		install -m644 $f "$subpkgdir"/usr/share/doc/$pkgname/
+	done
+}
 
 sha512sums="f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90  arpwatch-2.1a15.tar.gz
 854f6361bf02586516db4f50afdee729c047cd788985f72f475e592e0e744c24d7d765f0391d733dbf417048c26b6d43c00eb63c58e6798bdb2366b93cbfe03a  arpwatch.confd