Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -165,7 +165,8 @@
 	stage-packages stage-packages-kernel stage-packages-world \
 	create-packages-world create-packages-kernel create-packages \
 	update-packages packages installconfig real-packages real-update-packages \
-	sign-packages package-pkg print-dir test-system-compiler test-system-linker
+	sign-packages sign-update-packages package-pkg print-dir \
+	test-system-compiler test-system-linker
 
 # These targets require a TARGET and TARGET_ARCH be defined.
 XTGTS=	native-xtools native-xtools-install xdev xdev-build xdev-install \
Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -1870,13 +1870,13 @@
 	@env ASSUME_ALWAYS_YES=YES pkg bootstrap
 .endif
 
-.if make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages)
+.if make(create-world-packages-jobs) || make(create-kernel-packages*) || make(sign-update-packages)
 PKG_ABI!=${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI
 .endif
 
-.if !defined(PKG_VERSION_FROM) && make(real-update-packages)
+.if !defined(PKG_VERSION_FROM) && make(sign-update-packages)
 .if defined(PKG_ABI)
-.if exists(${REPODIR}/${PKG_ABI})
+.if exists(${REPODIR}/${PKG_ABI}/latest)
 PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest
 PKG_VERSION_FROM_DIR=	${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM}
 .else
@@ -1904,8 +1904,10 @@
 
 real-packages:	stage-packages create-packages sign-packages .PHONY
 
-real-update-packages: stage-packages .PHONY
-	${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages
+real-update-packages: stage-packages create-packages .PHONY
+	${_+_}${MAKE} -C ${.CURDIR} sign-update-packages
+
+sign-update-packages: .PHONY
 .if empty(PKG_VERSION_FROM_DIR)
 	@echo "==> Bootstrapping repository, not checking for new packages"
 .else