diff --git a/general/package/wifibroadcast-ng/files/wfb-cli b/general/package/wifibroadcast-ng/files/wfb-cli
new file mode 100755
index 00000000..0892658b
--- /dev/null
+++ b/general/package/wifibroadcast-ng/files/wfb-cli
@@ -0,0 +1,2 @@
+#!/bin/sh
+yaml-cli -i /etc/wfb.yaml "$@"
diff --git a/general/package/wifibroadcast-ng/files/wifibroadcast b/general/package/wifibroadcast-ng/files/wifibroadcast
index 7b6a5868..37988c14 100755
--- a/general/package/wifibroadcast-ng/files/wifibroadcast
+++ b/general/package/wifibroadcast-ng/files/wifibroadcast
@@ -1,10 +1,9 @@
 #!/bin/sh
 wfb_soc=$(ipcinfo -c)
 wfb_key=/etc/drone.key
-wfb_cfg=/etc/wfb.yaml
 
 wfb_yaml() {
-	if [ -e "$wfb_cfg" ]; then
+	if [ -e /etc/wfb.yaml ]; then
 		if [ "$1" = "b" ]; then
 			config=broadcast
 		elif [ "$1" = "t" ]; then
@@ -12,7 +11,7 @@ wfb_yaml() {
 		elif [ "$1" = "w" ]; then
 			config=wireless
 		fi
-		value=$(yaml-cli -i "$wfb_cfg" -g ."$config"."$2")
+		value=$(wfb-cli -g ."$config"."$2")
 	fi
 
 	eval "$2"="${value:-$3}"
diff --git a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
index c7105fb9..f6668892 100644
--- a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
+++ b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
@@ -27,6 +27,7 @@ define WIFIBROADCAST_NG_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx_cmd
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tun
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(WIFIBROADCAST_NG_PKGDIR)/files/wfb-cli
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(WIFIBROADCAST_NG_PKGDIR)/files/wifibroadcast
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(WIFIBROADCAST_NG_PKGDIR)/files/tweaksys
 endef