diff --git a/boards.csv b/boards.csv
index 8730e09..2c7f91b 100644
--- a/boards.csv
+++ b/boards.csv
@@ -1,9 +1,9 @@
 # Raspberry Pi boards
-raspberrypi_2b,Raspberry Pi 2 B,Raspberry Pi Foundation,bcm2836,rpi_2_defconfig,arm-linux-gnueabihf,rpi
-raspberrypi_3b,Raspberry Pi 3 B,Raspberry Pi Foundation,bcm2837,rpi_3_defconfig,aarch64-linux-gnu,rpi
+raspberrypi_2b,Raspberry Pi 2 B,Raspberry Pi Foundation,bcm2836,rpi_2_defconfig,arm-linux-gnueabihf,rpi,bcm2836-rpi-2-b
+raspberrypi_3b,Raspberry Pi 3 B,Raspberry Pi Foundation,bcm2837,rpi_3_defconfig,aarch64-linux-gnu,rpi,bcm2837-rpi-3-b
 
 # Allwinner A20 (sun7i) boards
-bananapi_m1,Banana Pi M1,Sinovoip,sun7i,Bananapi_defconfig,arm-linux-gnueabihf,sunxi
+bananapi_m1,Banana Pi M1,Sinovoip,sun7i,Bananapi_defconfig,arm-linux-gnueabihf,sunxi,sun7i-a20-bananapi
 
 # Allwinner A31/A31s (sun6i) boards
-bananapi_m2,Banana Pi M2,Sinovoip,sun6i,Sinovoip_BPI_M2_defconfig,arm-linux-gnueabihf,sunxi
+bananapi_m2,Banana Pi M2,Sinovoip,sun6i,Sinovoip_BPI_M2_defconfig,arm-linux-gnueabihf,sunxi,sun6i-a31s-sinovoip-bpi-m2
diff --git a/docs/_boards/bananapi_m1.md b/docs/_boards/bananapi_m1.md
index c27a6f2..4f8c21a 100644
--- a/docs/_boards/bananapi_m1.md
+++ b/docs/_boards/bananapi_m1.md
@@ -2,6 +2,7 @@
 layout: board
 title: SD card images - Banana Pi M1
 board_id: bananapi_m1
+board_dtb_name: sun7i-a20-bananapi
 board_name: Banana Pi M1
 board_maker_name: Sinovoip
 board_soc_name: Allwinner A20 (sun7i)
diff --git a/docs/_boards/bananapi_m2.md b/docs/_boards/bananapi_m2.md
index b87262b..6cacdb3 100644
--- a/docs/_boards/bananapi_m2.md
+++ b/docs/_boards/bananapi_m2.md
@@ -2,6 +2,7 @@
 layout: board
 title: SD card images - Banana Pi M2
 board_id: bananapi_m2
+board_dtb_name: sun6i-a31s-sinovoip-bpi-m2
 board_name: Banana Pi M2
 board_maker_name: Sinovoip
 board_soc_name: Allwinner A31 (sun6i)
diff --git a/docs/_boards/raspberrypi_2b.md b/docs/_boards/raspberrypi_2b.md
index fb75546..7cedb16 100644
--- a/docs/_boards/raspberrypi_2b.md
+++ b/docs/_boards/raspberrypi_2b.md
@@ -2,6 +2,7 @@
 layout: board
 title: SD card images - Raspberry Pi 2 B
 board_id: raspberrypi_2b
+board_dtb_name: bcm2836-rpi-2-b
 board_name: Raspberry Pi 2 B
 board_maker_name: Raspberry Pi Foundation
 board_soc_name: Broadcom BCM2836 (bcm2836)
diff --git a/docs/_boards/raspberrypi_3b.md b/docs/_boards/raspberrypi_3b.md
index 6becd81..51ffd4e 100644
--- a/docs/_boards/raspberrypi_3b.md
+++ b/docs/_boards/raspberrypi_3b.md
@@ -2,6 +2,7 @@
 layout: board
 title: SD card images - Raspberry Pi 3 B
 board_id: raspberrypi_3b
+board_dtb_name: bcm2837-rpi-3-b
 board_name: Raspberry Pi 3 B
 board_maker_name: Raspberry Pi Foundation
 board_soc_name: Broadcom BCM2837 (bcm2837)
diff --git a/rebuild-boots b/rebuild-boots
index e76d8c2..dcace71 100755
--- a/rebuild-boots
+++ b/rebuild-boots
@@ -10,7 +10,7 @@ mkdir -p /tmp/debimg/artifacts || exit
 mkdir -p /tmp/debimg/git-cache || exit
 
 IFS=,
-grep -vE "^#|^\s*$" boards.csv | while read BOARD_ID MODEL MAKE CHIP DEFCONFIG TUPLE TYPE
+grep -vE "^#|^\s*$" boards.csv | while read BOARD_ID MODEL MAKE CHIP DEFCONFIG TUPLE TYPE DTB _
 do
     docker run --rm \
                -v "${ARTIFACTS_DIR}":/artifacts \
diff --git a/rebuild-debians b/rebuild-debians
index 27688c7..9589a04 100755
--- a/rebuild-debians
+++ b/rebuild-debians
@@ -8,7 +8,7 @@ docker build -t debimg .
 mkdir -p /tmp/debimg/artifacts || exit
 
 IFS=,
-grep -vE "^#|^\s*$" debians.csv | while read DIST ARCH
+grep -vE "^#|^\s*$" debians.csv | while read DIST ARCH _
 do
     docker run --rm \
                -v "${ARTIFACTS_DIR}":/artifacts \
diff --git a/rebuild-jekyll-boards b/rebuild-jekyll-boards
index 5880282..1916231 100755
--- a/rebuild-jekyll-boards
+++ b/rebuild-jekyll-boards
@@ -27,6 +27,7 @@ with open("boards.csv") as csvfile:
 			boardf.write("layout: board\n")
 			boardf.write("title: SD card images - %s\n" % (row[1]))
 			boardf.write("board_id: %s\n" % (row[0]))
+			boardf.write("board_dtb_name: %s\n" % (row[7]))
 			boardf.write("board_name: %s\n" % (row[1]))
 			boardf.write("board_maker_name: %s\n" % (row[2]))
 			boardf.write("board_soc_name: %s %s (%s)\n" % (chips[row[3]][2],