diff --git a/sysutils/u-boot-bananapi/Makefile b/sysutils/u-boot-bananapi/Makefile
index 23f173e..e30f32d 100644
--- a/sysutils/u-boot-bananapi/Makefile
+++ b/sysutils/u-boot-bananapi/Makefile
@@ -1,15 +1,14 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-bananapi
+PKGNAMESUFFIX=	-${MODEL}
 
 COMMENT=	Cross-build U-Boot loader for Banana Pi
 
 LICENSE=	GPLv2
 
-# Local overrides
-MASTERDIR=	${.CURDIR}/../u-boot-cubieboard
+MASTERDIR=	${.CURDIR}/../u-boot-olimex-a20-som-evb
 DESCR=		${.CURDIR}/pkg-descr
 MODEL=		bananapi
-CONF_TARGET=	Bananapi_defconfig
+BOARD_CONFIG=	Bananapi_defconfig
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-bananapi/pkg-descr b/sysutils/u-boot-bananapi/pkg-descr
index 6a17018..e1902ee 100644
--- a/sysutils/u-boot-bananapi/pkg-descr
+++ b/sysutils/u-boot-bananapi/pkg-descr
@@ -1,19 +1,19 @@
-U-Boot loader for Banana Pi.
+U-Boot loader for BananaPi.
 
-To install this bootloader, follow the instructions in
- http://linux-sunxi.org/Bootable_SD_card#Bootloader
+To install this bootloader on an sdcard just do :
+dd if=/usr/local/share/u-boot/u-boot-boardname/u-boot-sunxi-with-spl.bin of=/path/to/sdcarddevice bs=1k seek=8 conv=notrunc,sync
 
 This version is patched so that:
  * ELF and API features are enabled.
  * The default environment is trimmed to just what's needed to boot.
  * The saveenv command writes to the file u-boot.env on the FAT partition.
- * The DTB file name is chosen based on the board model and passed to ubldr
-   using the fdtfile env variable.  ubldr loads the DTB from /boot/dtb/ on
+ * The DTB file name is chosen based on the board model and passed to ubldr.bin
+   using the fdtfile env variable. ubldr.bin loads the DTB from /boot/dtb/ on
    the FreeBSD partition.
- * By default, it loads ELF ubldr from file ubldr on the FAT partition
+ * By default, it loads PIE ubldr.bin from file ubldr.bin on the FAT partition
    to address 0x42000000, and launches it.
 
-For information about running FreeBSD on Banana Pi, see
+For information about running FreeBSD on Allwinner boards, see
  https://wiki.freebsd.org/FreeBSD/arm/Allwinner
 
 For general information about U-Boot see WWW: http://www.denx.de/wiki/U-Boot