diff --git a/Makefile b/Makefile
index 75460305e..ae870817c 100644
--- a/Makefile
+++ b/Makefile
@@ -154,13 +154,15 @@ preconfig: Kconfig
 
 export:
 ifneq ($(EXPORTDIR),)
+	$(Q) mkdir -p "${EXPORTDIR}"$(DELIM)registry || exit 1;
+ifneq ($(CONFIG_BUILD_KERNEL),y)
 ifneq ($(BUILTIN_REGISTRY),)
-	$(Q) mkdir -p "${EXPORTDIR}"/registry || exit 1; \
-	for f in "${BUILTIN_REGISTRY}"/*.bdat "${BUILTIN_REGISTRY}"/*.pdat ; do \
-		[ -f "$${f}" ] && cp -f "$${f}" "${EXPORTDIR}"/registry ; \
+	for f in "${BUILTIN_REGISTRY}"$(DELIM)*.bdat "${BUILTIN_REGISTRY}"$(DELIM)*.pdat ; do \
+		[ -f "$${f}" ] && cp -f "$${f}" "${EXPORTDIR}"$(DELIM)registry ; \
 	done
 endif
 endif
+endif
 
 .depdirs: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_depend)