diff --git a/release/Makefile b/release/Makefile
--- a/release/Makefile
+++ b/release/Makefile
@@ -75,14 +75,12 @@
 .endfor
 .endif
 
-.if !defined(NOPKGBASE) || empty(NOPKGBASE)
+.if ${.MAKE.OS} == "FreeBSD"
 PKGBASE_REPO_DIR= pkgbase-repo-dir
 WSTAGEDIR!=	${IMAKE} -f Makefile.inc1 -C ${WORLDDIR} -V WSTAGEDIR
 PKG_ABI_FILE=	${WSTAGEDIR}/usr/bin/uname
 PKG_ABI=	$$(${PKG_CMD} -o ABI_FILE=${PKG_ABI_FILE} config ABI)
-.endif
 
-.if ${.MAKE.OS} == "FreeBSD"
 # For installing packages into the release media.
 PKG_ENV+=	INSTALL_AS_USER=yes
 PKG_ENV+=	ASSUME_ALWAYS_YES=yes