diff --git a/config/Config-build.in b/config/Config-build.in
index 59dfaea8bb..6a6fb2882c 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -100,7 +100,7 @@ menu "Global build settings"
 		bool "Include build configuration in firmware" if DEVEL
 		default n
 		help
-		  If enabled, config.buildinfo will be stored in /etc/build.config of firmware.
+		  If enabled, buildinfo files will be stored in /etc/build.* of firmware.
 
 	config COLLECT_KERNEL_DEBUG
 		bool
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 18325564dc..4f4e93361f 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -198,7 +198,9 @@ define Package/base-files/install
 
 	$(if $(CONFIG_INCLUDE_CONFIG), \
 		echo -e "# Build configuration for board $(BOARD)/$(SUBTARGET)/$(PROFILE)\n" >$(1)/etc/build.config; \
-		cat $(BIN_DIR)/config.buildinfo >>$(1)/etc/build.config)
+		cat $(BIN_DIR)/config.buildinfo >>$(1)/etc/build.config; \
+		cat $(BIN_DIR)/feeds.buildinfo >>$(1)/etc/build.feeds; \
+		cat $(BIN_DIR)/version.buildinfo >>$(1)/etc/build.version)
 
 	$(if $(CONFIG_CLEAN_IPKG),, \
 		mkdir -p $(1)/etc/opkg; \