diff --git a/iopsys-brcm63xx-arm/base-files/lib/db/boards/XG6846B b/iopsys-brcm63xx-arm/base-files/lib/db/boards/XG6846B
index a5cd3d384cea835a736526383fa93c7f85648b7e..eeb5d62338fb6938f2d000c4a36b5e0ffcd55b7a 100644
--- a/iopsys-brcm63xx-arm/base-files/lib/db/boards/XG6846B
+++ b/iopsys-brcm63xx-arm/base-files/lib/db/boards/XG6846B
@@ -18,9 +18,9 @@ config board 'board'
 	# Ethernet
 	option ethernetPorts '6'
 	option ethernetWanPort 'eth5'
-	option ethernetPortNames 'LAN1 LAN2 LAN3 LAN4 LAN5 WAN'
-	option ethernetPortOrder 'eth0 eth1 eth2 eth3 eth4 eth5'
-	option ethernetLanPorts 'eth0 eth1 eth2 eth3 eth4'
+	option ethernetPortNames 'LAN1 LAN2 LAN3 LAN4 WAN'
+	option ethernetPortOrder 'eth0 eth1 eth2 eth3 eth5'
+	option ethernetLanPorts 'eth0 eth1 eth2 eth3'
 	option gpio_zero '0 1 3 67'
 	option gpio_one '2 40'
 
diff --git a/iopsys-brcm63xx-arm/panther/base-files/etc/init.d/wanconf b/iopsys-brcm63xx-arm/panther/base-files/etc/init.d/wanconf
new file mode 100755
index 0000000000000000000000000000000000000000..00d8bef496e769ce67a77a15a715262eb82c9905
--- /dev/null
+++ b/iopsys-brcm63xx-arm/panther/base-files/etc/init.d/wanconf
@@ -0,0 +1,8 @@
+#!/bin/sh /etc/rc.common
+
+START=15
+
+boot() {
+	wanconf
+}
+
diff --git a/iopsys-brcm63xx-arm/tiger/base-files/etc/init.d/fiber b/iopsys-brcm63xx-arm/tiger/base-files/etc/init.d/fiber
deleted file mode 100755
index 45a5068d0cf8078c241bab37836a97e64c1090ee..0000000000000000000000000000000000000000
--- a/iopsys-brcm63xx-arm/tiger/base-files/etc/init.d/fiber
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=60
-
-USE_PROCD=1
-
-start_service() {
-	wanconf
-}
-
-service_triggers()
-{
-        procd_add_reload_trigger network wireless
-}
-
diff --git a/iopsys-brcm63xx-arm/tiger/base-files/etc/init.d/wanconf b/iopsys-brcm63xx-arm/tiger/base-files/etc/init.d/wanconf
new file mode 100755
index 0000000000000000000000000000000000000000..00d8bef496e769ce67a77a15a715262eb82c9905
--- /dev/null
+++ b/iopsys-brcm63xx-arm/tiger/base-files/etc/init.d/wanconf
@@ -0,0 +1,8 @@
+#!/bin/sh /etc/rc.common
+
+START=15
+
+boot() {
+	wanconf
+}
+