1 files changed, 14 insertions, 2 deletions

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 82a3b07c7cfb..b5b093fe8633 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -241,12 +241,24 @@ stage_files stage_as:
 .else
 # normally only libs and includes are staged
 .if ${MK_STAGING_PROG:Uno} != "no"
-STAGE_SETS+= prog
 STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR}
+STAGE_SYMLINKS_DIR.prog= ${STAGE_OBJTOP}
+
+.if defined(PROGNAME)
+STAGE_AS_SETS+= prog
+STAGE_AS_${PROG}= ${PROGNAME}
+stage_as.prog: ${PROG}
 .if !empty(PROG)
-all: stage_files
+all: stage_as
+.endif
+.else
+STAGE_SETS+= prog
 stage_files.prog: ${PROG}
+.if !empty(PROG)
+all: stage_files
 .endif
+.endif
+
 .if !empty(SYMLINKS)
 all:   stage_symlinks
 STAGE_SYMLINKS.prog= ${SYMLINKS}