diff --git a/package/ctcgfw/luci-app-adguardhome/Makefile b/package/ctcgfw/luci-app-adguardhome/Makefile
index f3b3c35589..e5ed3f946c 100644
--- a/package/ctcgfw/luci-app-adguardhome/Makefile
+++ b/package/ctcgfw/luci-app-adguardhome/Makefile
@@ -8,45 +8,26 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=luci-app-adguardhome
 PKG_VERSION:=1.8
 PKG_RELEASE:=11
+PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+LUCI_TITLE:=LuCI app for AdGuardHome
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+ca-certs +curl +wget +PACKAGE_$(PKG_NAME)_INCLUDE_binary:AdGuardHome
+LUCI_DESCRIPTION:=LuCI support for AdGuardHome
 
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-adguardhome
-	SECTION:=luci
-	CATEGORY:=LuCI
-	SUBMENU:=3. Applications
-	TITLE:=LuCI app for adguardhome
-	PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
-	PKGARCH:=all
-	DEPENDS:=+!wget&&!curl:wget
+define Package/$(PKG_NAME)/config
+config PACKAGE_$(PKG_NAME)_INCLUDE_binary
+	bool "Include Binary File"
+	default y
 endef
 
-define Package/luci-app-adguardhome/description
-	LuCI support for adguardhome
-endef
-
-define Build/Prepare
-endef
-
-define Build/Compile
-endef
+PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_binary
 
 define Package/luci-app-adguardhome/conffiles
 /usr/share/AdGuardHome/links.txt
 /etc/config/AdGuardHome
 endef
 
-define Package/luci-app-adguardhome/install
-    $(INSTALL_DIR) $(1)/usr/lib/lua/luci
-	cp -pR ./luasrc/* $(1)/usr/lib/lua/luci
-	$(INSTALL_DIR) $(1)/
-	cp -pR ./root/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
-	po2lmo ./po/zh-cn/AdGuardHome.po $(1)/usr/lib/lua/luci/i18n/AdGuardHome.zh-cn.lmo
-endef
-
 define Package/luci-app-adguardhome/postinst
 #!/bin/sh
 	/etc/init.d/AdGuardHome enable >/dev/null 2>&1
@@ -72,4 +53,6 @@ fi
 exit 0
 endef
 
-$(eval $(call BuildPackage,luci-app-adguardhome))
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/package/ctcgfw/msgpack-c/Makefile b/package/ctcgfw/msgpack-c/Makefile
index c96681beae..1e2b438df5 100644
--- a/package/ctcgfw/msgpack-c/Makefile
+++ b/package/ctcgfw/msgpack-c/Makefile
@@ -43,7 +43,6 @@ endef
 define Package/libmsgpack-c
 	$(call Package/msgpack-c)
 	TITLE+= (Libraries)
-	VARIANT:=lib
 endef
 
 define Package/msgpack-c/description
diff --git a/package/ntlf9t/AdGuardHome/Makefile b/package/ntlf9t/AdGuardHome/Makefile
index 4d77bcd39d..0244ff7a66 100644
--- a/package/ntlf9t/AdGuardHome/Makefile
+++ b/package/ntlf9t/AdGuardHome/Makefile
@@ -55,7 +55,9 @@ define Build/Compile
 endef
 
 define Package/AdGuardHome/install
-	$(call GoPackage/Package/Install/Bin,$(1))
+	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
+	$(INSTALL_DIR) $(1)/usr/bin/AdGuardHome
+	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/AdGuardHome $(1)/usr/bin/AdGuardHome/AdGuardHome
 endef
 
 $(eval $(call GoBinPackage,AdGuardHome))