diff --git a/lang/runawk/Makefile b/lang/runawk/Makefile
index da5d2702f438..1f2cf752b3c4 100644
--- a/lang/runawk/Makefile
+++ b/lang/runawk/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	runawk
-PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -14,20 +13,14 @@ LICENSE=	MIT
 
 BUILD_DEPENDS=	mk-configure>=0.26.0:${PORTSDIR}/devel/mk-configure
 
-MAKE_ENV=	DESTDIR="${STAGEDIR}" EGDIR="${EXAMPLESDIR}" \
-		SUBPRJ_DFLT="${SUBPRJ_DFLT}"
+MAKE_ENV=	DESTDIR="${STAGEDIR}" EGDIR="${EXAMPLESDIR}"
+INSTALL_TARGET=	install install-doc install-examples
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-PORTDATA=	*
-PORTDOCS=	*
-PORTEXAMPLES=	*
-
-SUBPRJ_DFLT=	runawk modules doc examples
-
 do-build:
 	@${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/mkcmake -C ${WRKSRC}
 
diff --git a/lang/runawk/distinfo b/lang/runawk/distinfo
index 8970dae8cfdb..484628b5435b 100644
--- a/lang/runawk/distinfo
+++ b/lang/runawk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (runawk-1.5.1.tar.gz) = 74ecf303ce8267d4a34fbd3bae9880395d7a247364e11801f5bd463918843b8c
-SIZE (runawk-1.5.1.tar.gz) = 75217
+SHA256 (runawk-1.6.0.tar.gz) = 51461587ab0acb12994cc6de766ec4594f57cd49efea9d67a7a400628c41555f
+SIZE (runawk-1.6.0.tar.gz) = 75496
diff --git a/lang/runawk/pkg-plist b/lang/runawk/pkg-plist
index df78ea37d354..d693453c2076 100644
--- a/lang/runawk/pkg-plist
+++ b/lang/runawk/pkg-plist
@@ -4,3 +4,104 @@ bin/runawk
 man/man1/alt_getopt.1.gz
 man/man1/runawk.1.gz
 man/man3/runawk_modules.3.gz
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_alt_getopt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_alt_getopt.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_alt_getopt2.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_alt_join
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_backslash_in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_backslash_in.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_basename
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_dirname
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_embed_str
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_fieldwidths
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_fieldwidths.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_ftrans
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_glob
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_glob2ere
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_has_prefix
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_has_prefix.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_has_suffix
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_has_suffix.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_heapsort
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_heapsort.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_heapsort2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_heapsort3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_heapsort3.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_heapsort4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_heapsort4.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_ini
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_ini.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_io
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_minmax
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_modinfo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_multisub
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_power_getopt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_power_getopt2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_quicksort
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_quicksort2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_quicksort3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_readfile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_readfile.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_runcmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_shquote
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_shquote.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_splitre
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_str2regexp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_tmpfile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_tokenre
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_tokenre.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_tokenre2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_tokenre2.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_tokenre3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_tokenre3.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_tokenre4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_trim
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_trim.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo_trim_in
+%%DATADIR%%/CR_in.awk
+%%DATADIR%%/abort.awk
+%%DATADIR%%/abs.awk
+%%DATADIR%%/alt_assert.awk
+%%DATADIR%%/alt_getopt.awk
+%%DATADIR%%/alt_join.awk
+%%DATADIR%%/backslash_in.awk
+%%DATADIR%%/basename.awk
+%%DATADIR%%/braceexpand.awk
+%%DATADIR%%/dirname.awk
+%%DATADIR%%/embed_str.awk
+%%DATADIR%%/exitnow.awk
+%%DATADIR%%/fieldwidths.awk
+%%DATADIR%%/ftrans_in.awk
+%%DATADIR%%/gawk/ord.awk
+%%DATADIR%%/glob.awk
+%%DATADIR%%/has_prefix.awk
+%%DATADIR%%/has_suffix.awk
+%%DATADIR%%/heapsort.awk
+%%DATADIR%%/ini.awk
+%%DATADIR%%/init_getopt.awk
+%%DATADIR%%/io.awk
+%%DATADIR%%/isnum.awk
+%%DATADIR%%/match_br.awk
+%%DATADIR%%/max.awk
+%%DATADIR%%/min.awk
+%%DATADIR%%/modinfo.awk
+%%DATADIR%%/multisub.awk
+%%DATADIR%%/pow.awk
+%%DATADIR%%/power_getopt.awk
+%%DATADIR%%/quicksort.awk
+%%DATADIR%%/readfile.awk
+%%DATADIR%%/runcmd.awk
+%%DATADIR%%/shquote.awk
+%%DATADIR%%/sort.awk
+%%DATADIR%%/str2regexp.awk
+%%DATADIR%%/tmpfile.awk
+%%DATADIR%%/tokenre.awk
+%%DATADIR%%/trim.awk
+%%DATADIR%%/trim_in.awk
+%%DATADIR%%/xclose.awk
+%%DATADIR%%/xgetline.awk
+%%DATADIR%%/xsystem.awk