diff --git a/net/frr/Makefile b/net/frr/Makefile
index b75aa8f45113f..e891489ae5a47 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 PKG_NAME:=frr
 PKG_VERSION:=10.6.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/FRRouting/frr/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
@@ -80,7 +80,8 @@ endef
 define Package/frr
   $(call Package/frr/Default)
   DEPENDS:=+librt +libatomic +libcap +libncurses +libjson-c +libreadline \
-    +libyang +libprotobuf-c +FRR_OPENSSL:libopenssl +FRR_SNMP:libnetsnmp +more
+    +libyang +libprotobuf-c +FRR_OPENSSL:libopenssl +FRR_SNMP:libnetsnmp +more \
+    +USE_GLIBC:libcrypt-compat
   TITLE:=The FRRouting (FRR) Software Routing Suite
   MENU:=1
 endef
@@ -216,7 +217,7 @@ endef
 define Package/frr-zebra/install
 	$(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/lib
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libmlag_pb.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmlag_pb.so* $(1)/usr/lib/
 endef
 
 define Package/frr-pythontools/install
diff --git a/net/frr/test-version.sh b/net/frr/test-version.sh
new file mode 100755
index 0000000000000..845ed72941fa0
--- /dev/null
+++ b/net/frr/test-version.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# shellcheck shell=busybox
+
+case "$1" in
+frr)
+	vtysh --version | grep -F "$2" || exit 1
+	mgmtd --version | grep -F "$2"
+	;;
+frr-pythontools)
+	# Python scripts only, no version information provided
+	exit 0
+	;;
+frr-*)
+	"/usr/sbin/${1#frr-}" --version | grep -F "$2"
+	;;
+*)
+	echo "Untested package: $1" >&2
+	exit 1
+	;;
+esac