diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 19f21472bd..9181d86a1c 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -23,6 +23,7 @@ BUNDLER_PATH := $(subst $(space),:,$(filter-out $(TOPDIR)/%,$(subst :,$(space),$
 BUNDLER_COMMAND := PATH=$(BUNDLER_PATH) $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(PKG_BUILD_DIR)/staging_dir/host
 
 PACKAGE_SUFFIX:=$(if $(CONFIG_USE_APK),apk,ipk)
+PACKAGE_VERSION_SEPARATOR:=$(if $(CONFIG_USE_APK),-,_)
 
 all: compile
 
@@ -71,9 +72,9 @@ endif
 ifeq ($(CONFIG_IB_STANDALONE),)
 	$(FIND) $(call FeedPackageDir,libc) -type f \
 	  \( \
-		-name 'base-files-*.$(PACKAGE_SUFFIX)' -or \
-		-name 'libc-*.$(PACKAGE_SUFFIX)' -or \
-		-name 'kernel-*.$(PACKAGE_SUFFIX)' \) \
+		-name 'base-files$(PACKAGE_VERSION_SEPARATOR)*.$(PACKAGE_SUFFIX)' -or \
+		-name 'libc$(PACKAGE_VERSION_SEPARATOR)*.$(PACKAGE_SUFFIX)' -or \
+		-name 'kernel$(PACKAGE_VERSION_SEPARATOR)*.$(PACKAGE_SUFFIX)' \) \
 	  -exec $(CP) -t $(PKG_BUILD_DIR)/packages {} +
 else
 	$(FIND) $(wildcard $(PACKAGE_SUBDIRS)) -type f -name '*.$(PACKAGE_SUFFIX)' \