diff --git a/net/batman-adv-legacy/Makefile b/net/batman-adv-legacy/Makefile
index 3f27c51..f37b744 100644
--- a/net/batman-adv-legacy/Makefile
+++ b/net/batman-adv-legacy/Makefile
@@ -19,7 +19,7 @@ BATCTL_MD5SUM:=42e269cc710bbc9a8fd17628201d4258
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/freifunk-gluon/batman-adv-legacy.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=7b775e93b7d2d3f10b137e76090c82a06af65272
+PKG_SOURCE_VERSION:=f18bcec07bc22382968d148afcdaa48b2aa0eb73
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 BATCTL_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION)
@@ -34,9 +34,9 @@ define KernelPackage/batman-adv-legacy
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
   SUBMENU:=Network Support
   DEPENDS:=+kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +libc
-  TITLE:=B.A.T.M.A.N. Adv
-  FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,batman-adv)
+  TITLE:=B.A.T.M.A.N. Adv Legacy
+  FILES:=$(PKG_BUILD_DIR)/batman-adv-legacy.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,batman-adv-legacy)
 endef
 
 define KernelPackage/batman-adv-legacy/description
@@ -56,6 +56,8 @@ MAKE_BATMAN_ADV_ARGS += \
 	SUBDIRS="$(PKG_BUILD_DIR)" \
 	PWD="$(PKG_BUILD_DIR)" \
 	LINUX_VERSION="$(LINUX_VERSION)" \
+	OBJDUMP="$(TARGET_CROSS)objdump" \
+	OBJCOPY="$(TARGET_CROSS)objcopy" \
 	CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_LEGACY_DEBUG_LOG),y,n) \
 	CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_LEGACY_BLA),y,n) \
 	CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_LEGACY_DAT),y,n) \
@@ -98,7 +100,7 @@ $(eval $(call Download,batctl-legacy))
 BATCTL_EXTRACT = tar xzf "$(DL_DIR)/batctl-$(BATCTL_VERSION).tar.gz" -C "$(PKG_BUILD_DIR)"
 BATCTL_PATCH = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)",batctl)
 BATCTL_BUILD = $(MAKE_BATCTL_ENV) $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
-BATCTL_INSTALL = $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/
+BATCTL_INSTALL = $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl-legacy $(1)/usr/sbin/
 endif
 
 KPATCH ?= $(PATCH)
@@ -129,11 +131,11 @@ define Build/Compile
 endef
 
 define KernelPackage/batman-adv-legacy/install
-	$(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv $(1)/usr/sbin $(1)/lib/netifd/proto
-	$(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config
-	$(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv
-	$(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net
-	$(INSTALL_BIN) ./files/lib/netifd/proto/batadv.sh $(1)/lib/netifd/proto
+	$(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv-legacy $(1)/usr/sbin $(1)/lib/netifd/proto
+	$(INSTALL_DATA) ./files/etc/config/batman-adv-legacy $(1)/etc/config
+	$(INSTALL_DATA) ./files/lib/batman-adv-legacy/config.sh $(1)/lib/batman-adv-legacy
+	$(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv-legacy $(1)/etc/hotplug.d/net
+	$(INSTALL_BIN) ./files/lib/netifd/proto/batadv-legacy.sh $(1)/lib/netifd/proto
 	$(BATCTL_INSTALL)
 endef
 
diff --git a/net/batman-adv-legacy/files/etc/config/batman-adv b/net/batman-adv-legacy/files/etc/config/batman-adv-legacy
similarity index 100%
rename from net/batman-adv-legacy/files/etc/config/batman-adv
rename to net/batman-adv-legacy/files/etc/config/batman-adv-legacy
diff --git a/net/batman-adv-legacy/files/etc/hotplug.d/net/99-batman-adv b/net/batman-adv-legacy/files/etc/hotplug.d/net/99-batman-adv-legacy
similarity index 81%
rename from net/batman-adv-legacy/files/etc/hotplug.d/net/99-batman-adv
rename to net/batman-adv-legacy/files/etc/hotplug.d/net/99-batman-adv-legacy
index f0c391f..db2447e 100644
--- a/net/batman-adv-legacy/files/etc/hotplug.d/net/99-batman-adv
+++ b/net/batman-adv-legacy/files/etc/hotplug.d/net/99-batman-adv-legacy
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /lib/batman-adv/config.sh
+. /lib/batman-adv-legacy/config.sh
 
 bat_load_module
 config_load batman-adv
diff --git a/net/batman-adv-legacy/files/lib/batman-adv/config.sh b/net/batman-adv-legacy/files/lib/batman-adv-legacy/config.sh
similarity index 92%
rename from net/batman-adv-legacy/files/lib/batman-adv/config.sh
rename to net/batman-adv-legacy/files/lib/batman-adv-legacy/config.sh
index 471c1f2..7ea368b 100644
--- a/net/batman-adv-legacy/files/lib/batman-adv/config.sh
+++ b/net/batman-adv-legacy/files/lib/batman-adv-legacy/config.sh
@@ -2,10 +2,10 @@
 
 bat_load_module()
 {
-	[ -d "/sys/module/batman_adv/" ] && return
+	[ -d "/sys/module/batman_adv_legacy/" ] && return
 
 	. /lib/functions.sh
-	load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-crypto* /etc/modules.d/*-lib-crc* /etc/modules.d/*-batman-adv*
+	load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-crypto* /etc/modules.d/*-lib-crc* /etc/modules.d/*-batman-adv-legacy*
 }
 
 bat_config()
@@ -29,7 +29,7 @@ bat_config()
 	config_get orig_interval "$mesh" orig_interval
 	config_get vis_mode "$mesh" vis_mode
 
-	[ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1
+	[ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv-legacy mesh $mesh does not exist - check your interface configuration" && return 1
 
 	[ -n "$aggregate_ogms" ] && echo $aggregate_ogms > /sys/class/net/$mesh/mesh/aggregate_ogms
 	[ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation
diff --git a/net/batman-adv-legacy/files/lib/netifd/proto/batadv.sh b/net/batman-adv-legacy/files/lib/netifd/proto/batadv-legacy.sh
similarity index 68%
rename from net/batman-adv-legacy/files/lib/netifd/proto/batadv.sh
rename to net/batman-adv-legacy/files/lib/netifd/proto/batadv-legacy.sh
index 42acc28..ba87333 100644
--- a/net/batman-adv-legacy/files/lib/netifd/proto/batadv.sh
+++ b/net/batman-adv-legacy/files/lib/netifd/proto/batadv-legacy.sh
@@ -16,8 +16,8 @@ proto_batadv_setup() {
 	local mesh mesh_no_rebroadcast
 	json_get_vars mesh mesh_no_rebroadcast
 
-	echo "$mesh" > "/sys/class/net/$iface/batman_adv/mesh_iface"
-	[ -n "$mesh_no_rebroadcast" ] && echo "$mesh_no_rebroadcast" > "/sys/class/net/$iface/batman_adv/no_rebroadcast"
+	echo "$mesh" > "/sys/class/net/$iface/batman_adv_legacy/mesh_iface"
+	[ -n "$mesh_no_rebroadcast" ] && echo "$mesh_no_rebroadcast" > "/sys/class/net/$iface/batman_adv_legacy/no_rebroadcast"
 
 	proto_init_update "$iface" 1
 	proto_send_update "$config"
@@ -27,7 +27,7 @@ proto_batadv_teardown() {
 	local config="$1"
 	local iface="$2"
 
-	(echo "none" > "/sys/class/net/$iface/batman_adv/mesh_iface") 2>/dev/null
+	(echo "none" > "/sys/class/net/$iface/batman_adv_legacy/mesh_iface") 2>/dev/null
 }
 
-add_protocol batadv
+add_protocol batadv-legacy