diff --git a/tool/builddir/build.conf/repos_arm_v6 b/tool/builddir/build.conf/repos_arm_v6
index a00b0e1309..9e010ed15c 100644
--- a/tool/builddir/build.conf/repos_arm_v6
+++ b/tool/builddir/build.conf/repos_arm_v6
@@ -1,4 +1,6 @@
+
 #
 # Board support for Raspberry Pi family
 #
 #REPOSITORIES += $(GENODE_DIR)/repos/rpi
+
diff --git a/tool/builddir/build.conf/repos_arm_v7 b/tool/builddir/build.conf/repos_arm_v7
index a708c1522b..86ee83ee7f 100644
--- a/tool/builddir/build.conf/repos_arm_v7
+++ b/tool/builddir/build.conf/repos_arm_v7
@@ -1,3 +1,4 @@
+
 #
 # Board-support for Xilinx Zynq-7000 SoC
 #
diff --git a/tool/builddir/build.conf/repos_arm_v8 b/tool/builddir/build.conf/repos_arm_v8
index 8bdd984dc9..7793e54b10 100644
--- a/tool/builddir/build.conf/repos_arm_v8
+++ b/tool/builddir/build.conf/repos_arm_v8
@@ -1,3 +1,4 @@
+
 #
 # Board support for i.MX SoC family
 #
@@ -12,3 +13,4 @@
 # Board support for Allwinner SoC family
 #
 #REPOSITORIES += $(GENODE_DIR)/repos/allwinner
+
diff --git a/tool/builddir/build.conf/repos_riscv b/tool/builddir/build.conf/repos_riscv
index 2141a9716d..a0c0333057 100644
--- a/tool/builddir/build.conf/repos_riscv
+++ b/tool/builddir/build.conf/repos_riscv
@@ -1,3 +1,4 @@
+
 #
 # Board support for RISC-V Qemu / MiG-V
 #
diff --git a/tool/builddir/build.conf/repos_x86 b/tool/builddir/build.conf/repos_x86
index 67d9230eb7..d41ebfd37a 100644
--- a/tool/builddir/build.conf/repos_x86
+++ b/tool/builddir/build.conf/repos_x86
@@ -1,3 +1,4 @@
+
 #
 # Drivers for x86 PC
 #
diff --git a/tool/create_builddir b/tool/create_builddir
index f465fbf49b..d78c9c0375 100755
--- a/tool/create_builddir
+++ b/tool/create_builddir
@@ -85,13 +85,13 @@ endif
 $(BUILD_DIR)/etc:
 	@mkdir -p $@
 
-BUILD_CONF_X86      := run_x86 run_boot_dir repos repos_x86
-BUILD_CONF_ARM_V6   := run_arm_v6 run_boot_dir repos repos_arm_v6
-BUILD_CONF_ARM_V7   := run_arm_v7 run_boot_dir repos repos_arm_v7
+BUILD_CONF_X86      := run_x86    run_boot_dir repos_x86    repos
+BUILD_CONF_ARM_V6   := run_arm_v6 run_boot_dir repos_arm_v6 repos
+BUILD_CONF_ARM_V7   := run_arm_v7 run_boot_dir repos_arm_v7 repos
 BUILD_CONF(arm_v6)  := $(BUILD_CONF_ARM_V6)
 BUILD_CONF(arm_v7a) := $(BUILD_CONF_ARM_V7)
-BUILD_CONF(arm_v8a) := run_arm_v8 run_boot_dir repos repos_arm_v8
-BUILD_CONF(riscv)   := run_riscv run_boot_dir repos repos_riscv
+BUILD_CONF(arm_v8a) := run_arm_v8 run_boot_dir repos_arm_v8 repos
+BUILD_CONF(riscv)   := run_riscv  run_boot_dir repos_riscv  repos
 BUILD_CONF(x86_32)  := run_x86_32 $(BUILD_CONF_X86)
 BUILD_CONF(x86_64)  := run_x86_64 $(BUILD_CONF_X86)