diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp
index f10a7fc5..2cd7cf5b 100644
--- a/bsp/board_ar71xx.bsp
+++ b/bsp/board_ar71xx.bsp
@@ -21,6 +21,7 @@ images=("openwrt-ar71xx-generic-cpe210-220-510-520-squashfs-sysupgrade.bin"
         "openwrt-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin"
         "openwrt-ar71xx-generic-tl-mr3020-v1-squashfs-sysupgrade.bin"
         "openwrt-ar71xx-generic-ubnt-bullet-m-squashfs-sysupgrade.bin"
+        "openwrt-ar71xx-generic-ubnt-unifi-squashfs-sysupgrade.bin"
         "openwrt-ar71xx-generic-tl-wdr3500-v1-squashfs-sysupgrade.bin"
         "openwrt-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin"
         "openwrt-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin"
diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile
index c55f92f2..edcf12d4 100644
--- a/src/packages/fff/fff-boardname/Makefile
+++ b/src/packages/fff/fff-boardname/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-boardname
-PKG_VERSION:=0.0.1
+PKG_VERSION:=0.0.2
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-boardname
diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname
index 28811a35..2bd8b746 100755
--- a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname
+++ b/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname
@@ -28,6 +28,9 @@ case "$BOARD" in
     bullet-m)
         BOARD=ubnt-bullet-m
         ;;
+    unifi)
+        BOARD=ubnt-unifi
+        ;;
     loco-m-xw)
         BOARD=ubnt-loco-m-xw
         ;;
diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
index 5ccf3011..115abd28 100644
--- a/src/packages/fff/fff-network/Makefile
+++ b/src/packages/fff/fff-network/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-network
-PKG_VERSION:=0.0.3
+PKG_VERSION:=0.0.4
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-network
diff --git a/src/packages/fff/fff-network/ar71xx/network.mode b/src/packages/fff/fff-network/ar71xx/network.mode
index de16aa33..9112f432 100644
--- a/src/packages/fff/fff-network/ar71xx/network.mode
+++ b/src/packages/fff/fff-network/ar71xx/network.mode
@@ -21,7 +21,7 @@
 ## For devices only including one ethernet port the specifier is called
 ## ETHMODE. The default mode for these devices is "BATMAN".
 ## For example this is the case for: gl-ar150, tl-mr3020-v1, tl-wa850re-v1,
-## tl-wa860re-v1, ubnt-bullet-m, ubnt-loco-m-xw, ubnt-nano-m
+## tl-wa860re-v1, ubnt-bullet-m, ubnt-loco-m-xw, ubnt-nano-m, ubnt-unifi
 ETHMODE="BATMAN"
 ## Devices featuring 2 ethernet ports are configured by SPECIFIERs ressembling
 ## the labels on the PORT itself. For the cpe210 these are called LAN0 and LAN1.
diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi b/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi
new file mode 100644
index 00000000..c16993d9
--- /dev/null
+++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi
@@ -0,0 +1,29 @@
+WANDEV=eth0
+SWITCHDEV=eth0
+CLIENT_PORTS=""
+WAN_PORTS=""
+BATMAN_PORTS=""
+
+. /etc/network.mode
+
+ETHMESHMAC=
+ROUTERMAC=w2mesh
+
+uci set network.$SWITCHDEV=interface
+uci set network.$SWITCHDEV.ifname=$SWITCHDEV
+uci set network.mesh.ifname="bat0"
+
+if [ "$ETHMODE" = "WAN" ] ; then
+  ## Activate for WAN:
+  echo "net.ipv6.conf.$WANDEV.accept_ra_defrtr = 1" >> /etc/sysctl.conf
+  echo "net.ipv6.conf.$WANDEV.accept_ra_pinfo = 1" >> /etc/sysctl.conf
+  echo "net.ipv6.conf.$WANDEV.autoconf = 1" >> /etc/sysctl.conf
+  echo "net.ipv6.conf.$WANDEV.accept_ra_rtr_pref = 1" >> /etc/sysctl.conf
+  uci set network.wan.ifname=$WANDEV
+elif [ "$ETHMODE" = "CLIENT" ] ; then
+  ## Activate Client:
+  uci set network.mesh.ifname="bat0 $SWITCHDEV"
+else
+  ## Activate BATMAN:
+  uci set network.ethmesh.ifname="$SWITCHDEV"
+fi