diff --git a/srcpkgs/nasm-doc b/srcpkgs/nasm-doc
new file mode 120000
index 00000000000..22115fab056
--- /dev/null
+++ b/srcpkgs/nasm-doc
@@ -0,0 +1 @@
+nasm
\ No newline at end of file
diff --git a/srcpkgs/nasm-doc/template b/srcpkgs/nasm-doc/template
deleted file mode 100644
index 3bc6cce435f..00000000000
--- a/srcpkgs/nasm-doc/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'nasm-doc'
-# Separate to avoid dependency cycles; keep in sync with nasm.
-pkgname=nasm-doc
-version=2.16.01
-revision=1
-build_style=gnu-configure
-make_build_args="doc"
-hostmakedepends="groff perl perl-Font-TTF perl-IO-String perl-Sort-Versions
- ghostscript source-sans-pro liberation-fonts-ttf"
-short_desc="80x86 assembler designed for portability and modularity - documentation"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://www.nasm.us"
-distfiles="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.xz"
-checksum=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558
-
-pre_configure() {
-	vsed -i doc/psfonts.ph -e "s;SourceSansPro;SourceSans3;g"
-}
-
-do_install() {
-	make -C doc DESTDIR="${DESTDIR}" docdir=/usr/share/doc/nasm install
-	vlicense LICENSE
-}
diff --git a/srcpkgs/nasm/template b/srcpkgs/nasm/template
index 41e7340c37e..ee21e020954 100644
--- a/srcpkgs/nasm/template
+++ b/srcpkgs/nasm/template
@@ -1,18 +1,57 @@
 # Template file for 'nasm'
-# Update nasm-doc which is separate to avoid dependency cycles
 pkgname=nasm
-version=2.16.01
+version=2.16.03
 revision=1
 build_style=gnu-configure
-make_build_args="all"
+make_build_target="all"
+make_check_target="golden test"
+checkdepends="perl"
 short_desc="80x86 assembler designed for portability and modularity"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Rutpiv <roger_freitas@live.com>"
 license="BSD-2-Clause"
 homepage="https://www.nasm.us"
 changelog="https://nasm.us/doc/nasmdocc.html"
 distfiles="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.xz"
-checksum=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558
+checksum=1412a1c760bbd05db026b6c0d1657affd6631cd0a63cddb6f73cc6d4aa616148
+
+build_options="doc"
+desc_option_doc="Enable building documentation"
+build_options_default="doc"
+
+disable_parallel_check=yes
+
+subpackages=" "
+
+if [ "$build_option_doc" ]; then
+	subpackages="nasm-doc"
+	hostmakedepends="groff perl perl-Font-TTF perl-IO-String perl-Sort-Versions
+		ghostscript source-sans-pro liberation-fonts-ttf"
+fi
+
+pre_configure() {
+	if [ "$build_option_doc" ]; then
+		vsed -i doc/psfonts.ph -e "s;SourceSansPro;SourceSans3;g"
+	fi
+}
+
+post_build() {
+	if [ "$build_option_doc" ]; then
+		make doc
+	fi
+}
 
 post_install() {
+	if [ "$build_option_doc" ]; then
+		make -C doc DESTDIR="${DESTDIR}" docdir=/usr/share/doc/nasm install
+	fi
 	vlicense LICENSE
 }
+
+nasm-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}-${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc/nasm
+		vlicense LICENSE
+	}
+}