diff --git a/net/serval-mesh-extender/Makefile b/net/serval-mesh-extender/Makefile
index 9191cf7..ab375bd 100644
--- a/net/serval-mesh-extender/Makefile
+++ b/net/serval-mesh-extender/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=serval-mesh-extender
-PKG_VERSION:=START.20180429.0810.50
-PKG_RELEASE:=82
+PKG_VERSION:=START.20191001.1654.1
+PKG_RELEASE:=84
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:= +libc
@@ -51,7 +51,7 @@ define Package/serval-mesh-extender/install
 	$(INSTALL_BIN) ./files/etc/profile $(1)/etc
 	$(INSTALL_DIR) $(1)/etc/rc.d
 	$(INSTALL_BIN) ./files/etc/rc.d/S13pre_wireless_setup $(1)/etc/rc.d
-	$(INSTALL_BIN) ./files/etc/rc.d/S15wireless_setup $(1)/etc/rc.d
+	$(INSTALL_BIN) ./files/etc/rc.d/S18wireless_setup $(1)/etc/rc.d
 	$(INSTALL_BIN) ./files/etc/rc.d/S17mountstuff $(1)/etc/rc.d
 	$(INSTALL_BIN) ./files/etc/rc.d/S47radioeeprom $(1)/etc/rc.d
 	$(INSTALL_BIN) ./files/etc/rc.d/S49servald $(1)/etc/rc.d
diff --git a/net/serval-mesh-extender/files/etc/rc.d/S15wireless_setup b/net/serval-mesh-extender/files/etc/rc.d/S18wireless_setup
similarity index 79%
rename from net/serval-mesh-extender/files/etc/rc.d/S15wireless_setup
rename to net/serval-mesh-extender/files/etc/rc.d/S18wireless_setup
index 47be92c..7295646 100755
--- a/net/serval-mesh-extender/files/etc/rc.d/S15wireless_setup
+++ b/net/serval-mesh-extender/files/etc/rc.d/S18wireless_setup
@@ -19,7 +19,14 @@ meshE=`dd if=/dev/urandom bs=5 count=1 | hexdump -e '1/1 "%02X" ":" 1/1 "%02X" "
 
 echo $meship $meshE $ap0E $ap1E $apip
 
-sed -e s/MESHIP/$meship/g -e s/APIP/$apip/g -e s/MESHETHER/$meshE/g  -e s/APETHER0/$ap0E/g -e s/APETHER1/$ap1E/g < /etc/config/network.template > /etc/config/network
+# Determine whether to load our pre-defined template or a user-defined one
+NETWORK_TEMPLATE="/etc/config/network.template"
+if [ -e "/dos/network.template" ]; then
+    NETWORK_TEMPLATE="/dos/network.template"
+fi
+
+# Apply our variables to the template and write to /etc/config/network
+sed -e s/MESHIP/$meship/g -e s/APIP/$apip/g -e s/MESHETHER/$meshE/g  -e s/APETHER0/$ap0E/g -e s/APETHER1/$ap1E/g < $NETWORK_TEMPLATE > /etc/config/network
 
 # If left hanging around can cause problems.
 # (should be deleted when we fresh install, but this doesn't always seem to be the case)