diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile
index 7cd9e9fb631a7808d69d8267cabc9578d45ed26c..71b842b96eb3df8c1e4e978f7b192186e37e3879 100644
--- a/package/boot/uboot-envtools/Makefile
+++ b/package/boot/uboot-envtools/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=uboot-envtools
 PKG_DISTNAME:=u-boot
 PKG_VERSION:=2018.03
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.xz
diff --git a/package/boot/uboot-envtools/files/apm821xx b/package/boot/uboot-envtools/files/apm821xx
new file mode 100644
index 0000000000000000000000000000000000000000..6bcc3ad62f122e02a596e67506f4c08402cd4eb9
--- /dev/null
+++ b/package/boot/uboot-envtools/files/apm821xx
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+[ -e /etc/config/ubootenv ] && exit 0
+
+touch /etc/config/ubootenv
+
+. /lib/uboot-envtools.sh
+. /lib/functions.sh
+
+board=$(board_name)
+
+case "$board" in
+meraki,mr24)
+	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x4000" "0x4000" "4"
+	ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x4000" "0x4000" "4"
+	;;
+meraki,mx60)
+	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000" "4"
+	;;
+netgear,wndap620|\
+netgear,wndap660)
+	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x4000" "0x4000" "4"
+	;;
+esac
+
+config_load ubootenv
+config_foreach ubootenv_add_app_config ubootenv
+
+exit 0
diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
index aa0bf4514fad8cd0d75c85b7b79f5057dd11a852..a306f6733bce47fee37cff75b5564e478c927eeb 100644
--- a/package/boot/uboot-envtools/files/ath79
+++ b/package/boot/uboot-envtools/files/ath79
@@ -13,6 +13,10 @@ touch /etc/config/ubootenv
 board=$(board_name)
 
 case "$board" in
+buffalo,wzr-hp-ag300h)
+        ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000"
+        ;;
+buffalo,bhr-4grv2|\
 glinet,ar300m|\
 ocedo,koala|\
 ocedo,raccoon|\
diff --git a/package/boot/uboot-envtools/files/mxs b/package/boot/uboot-envtools/files/mxs
index 37d3c96ed47dd09d58897b3b4aab21db4c1beba8..ecfb5de1621ff70ba3ba3afe74167b3ff02ba40c 100644
--- a/package/boot/uboot-envtools/files/mxs
+++ b/package/boot/uboot-envtools/files/mxs
@@ -13,7 +13,7 @@ touch /etc/config/ubootenv
 board=$(board_name)
 
 case "$board" in
-duckbill)
+i2se,duckbill)
 	ubootenv_add_uci_config "/dev/mmcblk0" "0x20000" "0x20000"
 	ubootenv_add_uci_config "/dev/mmcblk0" "0x40000" "0x20000"
 	;;
diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips
index f992f41bc89fde2759e0ffc1cf0db3af6c45d86b..6b539ef6d815e9eee44acdb0cfba4eae2fa39eac 100644
--- a/package/boot/uboot-envtools/files/ramips
+++ b/package/boot/uboot-envtools/files/ramips
@@ -17,7 +17,6 @@ alfa-network,ac1200rm|\
 alfa-network,awusfree1)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x1000"
 	;;
-all0239-3g|\
 all0256n-4M|\
 all0256n-8M|\
 all5002)