diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index 0204d8cad422..4a1ba19dc161 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -40,19 +40,15 @@ if [ ! -x /usr/local/sbin/pkg ]; then
 	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
 fi
 
-PKG_ABI=$(pkg -vv | grep ^ABI | awk '{print $3}')
-PKG_ABI="${PKG_ABI%\";}"
-PKG_ABI="${PKG_ABI#\"}"
-export PKG_ABI
+export PKG_ABI=$(pkg config ABI)
 export PKG_REPODIR="dvd/packages/${PKG_ABI}"
-export PKG_CACHEDIR="${PKG_REPODIR}/All"
 
-/bin/mkdir -p ${PKG_CACHEDIR}
+/bin/mkdir -p ${PKG_REPODIR}
 
 # Print pkg(8) information to make debugging easier.
 ${PKGCMD} -vv
 ${PKGCMD} update -f
-${PKGCMD} fetch -d ${DVD_PACKAGES}
+${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES}
 
 ${PKGCMD} repo ${PKG_REPODIR}