diff --git a/pkg/release-rpi3/cmdline.txt b/layer/bsp-rpi3/rpi_cmdline.txt
similarity index 100%
rename from pkg/release-rpi3/cmdline.txt
rename to layer/bsp-rpi3/rpi_cmdline.txt
diff --git a/pkg/firmware-rpi3/config.txt b/layer/bsp-rpi3/rpi_config.txt
similarity index 100%
rename from pkg/firmware-rpi3/config.txt
rename to layer/bsp-rpi3/rpi_config.txt
diff --git a/pkg/firmware-rpi3/boot-rpi3.files b/pkg/firmware-rpi3/boot-rpi3.files
index 6a206a0..cf2c4e4 100644
--- a/pkg/firmware-rpi3/boot-rpi3.files
+++ b/pkg/firmware-rpi3/boot-rpi3.files
@@ -5,5 +5,4 @@ file bootcode.bin 0664 0 0
 file fixup_x.dat 0664 0 0
 file start_cd.elf 0664 0 0
 file fixup.dat 0664 0 0
-file config.txt 0664 0 0
 file start_x.elf 0664 0 0
diff --git a/pkg/firmware-rpi3/build b/pkg/firmware-rpi3/build
index dfcd8b8..e86ace8 100755
--- a/pkg/firmware-rpi3/build
+++ b/pkg/firmware-rpi3/build
@@ -19,7 +19,6 @@ deploy() {
 
 	cp -r "$SOURCE/hardfp/opt" "$PKGDEPLOYDIR"
 	cp -r ${SOURCE}/boot/* "$PKGDEPLOYDIR/"
-	cp "$SCRIPTDIR/pkg/$PKGNAME/config.txt" "$PKGDEPLOYDIR/config.txt"
 	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 
 	strip_files ${PKGDEPLOYDIR}/opt/vc/bin/*
diff --git a/pkg/release-rpi3/build b/pkg/release-rpi3/build
index 7472393..a42a6c1 100755
--- a/pkg/release-rpi3/build
+++ b/pkg/release-rpi3/build
@@ -5,7 +5,6 @@ build() {
 	pkg install -om -r "$PKGBUILDDIR/boot" -R "$REPODIR" $DEPENDS
 
 	# copy files from this package
-	cp "$SCRIPTDIR/pkg/$PKGNAME/cmdline.txt" "$PKGBUILDDIR/boot"
 	cp "$SCRIPTDIR/pkg/$PKGNAME/install.sh" "$PKGBUILDDIR"
 	cp "$SCRIPTDIR/pkg/$PKGNAME/genimage.sh" "$PKGBUILDDIR"
 
@@ -17,6 +16,9 @@ build() {
 	local rootfs_image="$OS_RELEASE/rootfs.img"
 	local kernel_image="$OS_RELEASE/vmlinuz"
 
+	cat_file_override "rpi_config.txt" > "$PKGBUILDDIR/boot/config.txt"
+	cat_file_override "rpi_cmdline.txt" > "$PKGBUILDDIR/boot/cmdline.txt"
+
 	sed -i 's#ROOTFSFILE#'$rootfs_image'#g' "$PKGBUILDDIR/boot/cmdline.txt"
 	sed -i 's#KERNELFILE#'$kernel_image'#g' "$PKGBUILDDIR/boot/config.txt"
 }