diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index 1c957fc1581f..b9379d92b59a 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -47,10 +47,12 @@ ${group}NAME_${file:T}?=	${${group}NAME}
 ${group}NAME_${file:T}?=	${file:T}
 .endif
 .if !make(buildincludes)
-STAGE_AS_SETS+=	${group}
+STAGE_AS_SETS+=	${file:T}
 .endif
 STAGE_AS_${file:T}= ${${group}NAME_${file:T}}
-stage_as.${group}: ${file}
+# XXX {group}OWN,GRP,MODE
+STAGE_DIR.${file:T}= ${STAGE_OBJTOP}${${group}DIR_${file:T}}
+stage_as.${file:T}: ${file}
 
 installfiles-${group}: _${group}INS_${file:T}
 _${group}INS_${file:T}: ${file}
diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
index e1e0a4a98009..1c178b07d38e 100644
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -42,10 +42,12 @@ ${group}NAME_${header:T}?=	${${group}NAME}
 .else
 ${group}NAME_${header:T}?=	${header:T}
 .endif
-STAGE_AS_SETS+= ${group}
+STAGE_AS_SETS+= ${header:T}
 STAGE_AS_${header:T}= ${${group}NAME_${header:T}}
-stage_as.${group}: ${header}
-stage_includes: stage_as.${group}
+# XXX {group}OWN,GRP,MODE
+STAGE_DIR.${header:T}= ${STAGE_OBJTOP}${${group}DIR_${header:T}}
+stage_as.${header:T}: ${header}
+stage_includes: stage_as.${header:T}
 
 installincludes: _${group}INS_${header:T}
 _${group}INS_${header:T}: ${header}