diff --git a/board/calao/qil-a9260/at91bootstrap-1.16-qil-a9260.patch b/board/calao/qil-a9260/patches/at91bootstrap/0001-qil-a9260.patch
similarity index 100%
rename from board/calao/qil-a9260/at91bootstrap-1.16-qil-a9260.patch
rename to board/calao/qil-a9260/patches/at91bootstrap/0001-qil-a9260.patch
diff --git a/board/calao/qil-a9260/barebox-2012.07.0-qil-a9260.patch b/board/calao/qil-a9260/patches/barebox/0001-qil-a9260.patch
similarity index 100%
rename from board/calao/qil-a9260/barebox-2012.07.0-qil-a9260.patch
rename to board/calao/qil-a9260/patches/barebox/0001-qil-a9260.patch
diff --git a/board/calao/qil-a9260/linux-3.4.7.patch b/board/calao/qil-a9260/patches/linux/0001-qil-a9260.patch
similarity index 100%
rename from board/calao/qil-a9260/linux-3.4.7.patch
rename to board/calao/qil-a9260/patches/linux/0001-qil-a9260.patch
diff --git a/configs/calao_qil_a9260_defconfig b/configs/calao_qil_a9260_defconfig
index 05af114cf5..f18337fa7d 100644
--- a/configs/calao_qil_a9260_defconfig
+++ b/configs/calao_qil_a9260_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_arm926t=y
+BR2_GLOBAL_PATCH_DIR="board/calao/qil-a9260/patches/"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.4"
@@ -7,16 +8,15 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y
 BR2_PACKAGE_HOST_SAM_BA=y
 BR2_TARGET_ROOTFS_UBIFS=y
 BR2_TARGET_AT91BOOTSTRAP=y
-BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/qil-a9260/"
 BR2_TARGET_AT91BOOTSTRAP_BOARD="qil_a9260"
 BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
 BR2_TARGET_BAREBOX=y
-BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR="board/calao/qil-a9260/"
+BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
+BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2012.08.0"
 BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="qil_a9260"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
-BR2_LINUX_KERNEL_PATCH="board/calao/qil-a9260/linux-3.4.7.patch"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/qil-a9260/linux-3.4.7.config"
 BR2_LINUX_KERNEL_ZIMAGE=y