diff --git a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
index 23e7c6cd..109559d1 100644
--- a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
@@ -105,7 +105,7 @@ BR2_PACKAGE_RTL8733BU_OPENIPC=y
 # FPV
 BR2_PACKAGE_DATALINK=y
 BR2_PACKAGE_WIFIBROADCAST=y
-# BR2_PACKAGE_MAVLINK_ROUTER is not set
+BR2_PACKAGE_MAVLINK_ROUTER=y
 BR2_PACKAGE_MAVFWD=y
 
 # Debug
diff --git a/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini b/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini
new file mode 100644
index 00000000..3dbd6ee8
--- /dev/null
+++ b/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini
@@ -0,0 +1,16 @@
+[constants]
+arch = 'arm-openipc'
+abi = 'gnueabihf'
+
+[binaries]
+c = arch + '-linux-' + abi + '-gcc'
+cpp = arch + '-linux-' + abi + '-g++'
+ar = arch + '-linux-'+ abi + '-gcc-ar'
+strip = arch + '-linux-' + abi + '-strip'
+pkgconfig = 'pkg-config'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'arm'
+cpu = 'armv7l'
+endian = 'little'
diff --git a/general/package/mavlink-router/files/meson-cross-arm-openipc.ini b/general/package/mavlink-router/files/meson-cross-arm-musl-openipc.ini
similarity index 100%
rename from general/package/mavlink-router/files/meson-cross-arm-openipc.ini
rename to general/package/mavlink-router/files/meson-cross-arm-musl-openipc.ini
diff --git a/general/package/mavlink-router/files/meson-cross-mipsel-openipc.ini b/general/package/mavlink-router/files/meson-cross-mipsel-musl-openipc.ini
similarity index 100%
rename from general/package/mavlink-router/files/meson-cross-mipsel-openipc.ini
rename to general/package/mavlink-router/files/meson-cross-mipsel-musl-openipc.ini
diff --git a/general/package/mavlink-router/files/prepare.sh b/general/package/mavlink-router/files/prepare.sh
deleted file mode 100755
index ea5412bf..00000000
--- a/general/package/mavlink-router/files/prepare.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-git clone https://github.com/mavlink/c_library_v2.git -b master modules/mavlink_c_library_v2
-
diff --git a/general/package/mavlink-router/mavlink-router.mk b/general/package/mavlink-router/mavlink-router.mk
index 6119349d..01cb9436 100644
--- a/general/package/mavlink-router/mavlink-router.mk
+++ b/general/package/mavlink-router/mavlink-router.mk
@@ -4,21 +4,25 @@
 #
 ################################################################################
 
+MAVLINK_ROUTER_SITE_METHOD = git
+MAVLINK_ROUTER_SITE = https://github.com/mavlink-router/mavlink-router
 MAVLINK_ROUTER_VERSION = 18c06da77563db9ba1b7c4173ff5cae1646b383e
-MAVLINK_ROUTER_SITE = $(call github,mavlink-router,mavlink-router,$(MAVLINK_ROUTER_VERSION))
 MAVLINK_ROUTER_LICENSE = ASF-2.0
 
 MAVLINK_ROUTER_DEPENDENCIES += host-meson host-pkgconf
+MAVLINK_ROUTER_GIT_SUBMODULES = YES
+
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
+MAVLINK_ROUTER_LIBC = glibc
+else
+MAVLINK_ROUTER_LIBC = musl
+endif
 
 MAVLINK_ROUTER_CONF_OPTS += \
 	--buildtype=release \
-	--cross-file $(MAVLINK_ROUTER_PKGDIR)/files/meson-cross-$(ARCH)-openipc.ini
+	--cross-file $(MAVLINK_ROUTER_PKGDIR)/files/meson-cross-$(ARCH)-$(MAVLINK_ROUTER_LIBC)-openipc.ini
 
 define MAVLINK_ROUTER_CONFIGURE_CMDS
-	rm -rf $(@D)/build
-	mkdir -p $(@D)/build
-	cp -f $(MAVLINK_ROUTER_PKGDIR)/files/prepare.sh $(@D)/prepare.sh
-	cd $(@D) ; sh prepare.sh
 	$(TARGET_MAKE_ENV) meson setup $(MAVLINK_ROUTER_CONF_OPTS) $(@D) $(@D)/build
 endef