diff --git a/meshcomms/Makefile b/meshcomms/Makefile
index f2eaa3558..3f27c4e68 100644
--- a/meshcomms/Makefile
+++ b/meshcomms/Makefile
@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=meshcomms
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7b7fa65c9dfddd7f999a04488c96bfdcb96a0226
+PKG_SOURCE_VERSION:=8d5808d81d1fc96e4ce4ee682847b4de15b46224
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/meshcomms.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -54,6 +54,10 @@ endif
 
 define Package/meshcomms/install
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/meshcomms.conf $(1)/etc/config/meshcomms
+	$(INSTALL_BIN) ./files/meshcomms.init $(1)/etc/init.d/meshcomms
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/output/al_entity $(1)/usr/sbin/
 endef
 
diff --git a/meshcomms/files/meshcomms.conf b/meshcomms/files/meshcomms.conf
new file mode 100644
index 000000000..7d6a3a5c4
--- /dev/null
+++ b/meshcomms/files/meshcomms.conf
@@ -0,0 +1,7 @@
+config meshcomms 'global'
+    option basemacint 'wan'
+    list interfaces 'wan'
+    option mapall true
+    option debug  false
+    option port  8888
+
diff --git a/meshcomms/files/meshcomms.init b/meshcomms/files/meshcomms.init
new file mode 100644
index 000000000..df4a51686
--- /dev/null
+++ b/meshcomms/files/meshcomms.init
@@ -0,0 +1,100 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/al_entity
+
+validate_global_section()
+{
+	uci_validate_section meshcomms meshcomms "${1}" \
+		'basemacint:string:wan' \
+		'interfaces:string' \
+		'mapall:bool:true' \
+		'debug:bool:true' \
+		'port:port:8888'
+}
+
+get_l3_interface() {
+	local l3
+	# Get wan L3 interface
+	json_load "$(ubus -t 2 call network.interface.${1} status)"
+	json_get_var l3 l3_device
+	echo ${l3}
+}
+
+get_interface_mac() {
+	local l3 basemac
+	l3=$(get_l3_interface ${1})
+	json_load "$(ubus -t 2 call network.device status "{\"name\":\"${l3}\"}")"
+	json_get_var basemac macaddr
+	echo ${basemac}
+}
+
+configure_meshcomms()
+{
+	local basemacint interfaces mapall debug port l3device basemac intf
+
+	validate_global_section global || {
+		echo "Validation of global section failed"
+		return 1;
+	}
+	if [ ${debug} -eq 1 ]; then
+		# Forward stdout of the command to logd
+		procd_set_param stdout 1
+		# Same for stderr
+		procd_set_param stderr 1
+	fi
+	
+	basemac=$(get_interface_mac ${basemacint})
+
+
+	for f in ${interfaces}
+	do
+		local l3=$(get_l3_interface $f)
+		intf="${intf} ${l3}"
+	done
+	intf=$(echo $intf|sed 's/ /,/g')
+	[ -z "${intf}" ] && \
+		echo "interface list is empty/invalid">/dev/console \
+		return 1
+
+	procd_append_param command -m ${basemac} -i ${intf}
+
+	[ "${debug}" -eq 1 ] && \
+		procd_append_param command -vv
+
+	[ "${mapall}" -eq 1 ] && \
+		procd_append_param command -w
+
+	[ ${port} -ne 8888 ] && \
+		procd_append_param command -p ${port}
+}
+
+configure_network() {
+	ebtables -L FORWARD |grep -iq "01:80:c2:00:00:13 -j DROP"
+	if [ "$?" -ne 0 ]; then
+		echo "Applying drop rule to drop pkts forwared by kernel to 1905.1 multicast mac"
+		ebtables -A FORWARD -d 01:80:c2:00:00:13 -j DROP
+	fi
+	config_load meshcomms
+	config_foreach configure_meshcomms meshcomms
+}
+
+start_service() {
+	procd_open_instance meshcomms
+	procd_set_param command ${PROG}
+	configure_network
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger "network"
+}