diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile
index 31e673163b72d41341650b5fdf1782402c3e8198..499ae913c77a9171239868774886952020a92198 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.2
+PKG_VERSION:=3
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
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
old mode 100755
new mode 100644
index 94b98843b4f216de0f10d7d1ee37fdc49de2bef7..54704058e1ba05c6c56c784702c720f0162b8364
--- 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
@@ -16,11 +16,18 @@ case "$BOARD" in
         grep 740 /var/sysinfo/model && BOARD=tl-wr740n-v4
         ;;
     tl-wr841n-v7)
-        BOARD=tl-wr841nd-v7
+        BOARD=tl-wr841-v7
+        ;;
+    tl-wr841n-v8)
+        BOARD=tl-wr841-v8
         ;;
     tl-wr841n-v9)
-        grep "v10" /var/sysinfo/model && BOARD=tl-wr841n-v10
-        grep "v11" /var/sysinfo/model && BOARD=tl-wr841n-v11
+        BOARD=tl-wr841-v9
+        grep "v10" /var/sysinfo/model && BOARD=tl-wr841-v10
+        ;;
+    tl-wr841n-v11)
+        BOARD=tl-wr841-v11
+        grep "v12" /var/sysinfo/model && BOARD=tl-wr841-v12
         ;;
     nanostation-m)
         BOARD=ubnt-nano-m
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v10
similarity index 100%
rename from src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10
rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841-v10
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v11
similarity index 100%
rename from src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11
rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841-v11
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12
new file mode 100644
index 0000000000000000000000000000000000000000..4d22fded995e33177dd8584879f5bfcbe376e319
--- /dev/null
+++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12
@@ -0,0 +1,10 @@
+PORTORDER="4 3 2 1"
+
+WANDEV=eth1
+SWITCHDEV=eth0
+CLIENT_PORTS="1 2 0t"
+WAN_PORTS=
+BATMAN_PORTS="3 4 0t"
+
+ETHMESHMAC=eth1
+ROUTERMAC=eth0
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v7
similarity index 100%
rename from src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7
rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841-v7
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v8
similarity index 100%
rename from src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8
rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841-v8
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v9
similarity index 100%
rename from src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9
rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841-v9
diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile
index ab809c9e7dc06ed063cc20cb6637861d72ceb7f7..246db80f24c642975cfe0cd05a893172b9bf8788 100644
--- a/src/packages/fff/fff-sysupgrade/Makefile
+++ b/src/packages/fff/fff-sysupgrade/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-sysupgrade
-PKG_VERSION:=5
+PKG_VERSION:=6
 PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
index 8aaa924e8acdb16d46e7af65c0071a1ff5872895..8ef4949b11c1972d4a322115b63d3bc9b6f73f43 100755
--- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
+++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
@@ -30,16 +30,6 @@ case $BOARD in
         BOARD="cpe210-220" ;;
     cpe510 )
         BOARD="cpe510-520" ;;
-    wr841nd-v7 )
-        BOARD="wr841-v7" ;;
-    wr841n-v8 )
-        BOARD="wr841-v8" ;;
-    wr841n-v9 )
-        BOARD="wr841-v9" ;;
-    wr841n-v10 )
-        BOARD="wr841-v10" ;;
-    wr841n-v11 )
-        BOARD="wr841-v11" ;;
 esac
 
 wget "${UPGRADE_PATH}/release.nfo"