diff --git a/Makefile b/luci-app-mosdns/Makefile
similarity index 100%
rename from Makefile
rename to luci-app-mosdns/Makefile
diff --git a/luasrc/controller/mosdns.lua b/luci-app-mosdns/luasrc/controller/mosdns.lua
similarity index 100%
rename from luasrc/controller/mosdns.lua
rename to luci-app-mosdns/luasrc/controller/mosdns.lua
diff --git a/luasrc/model/cbi/mosdns/basic.lua b/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua
similarity index 100%
rename from luasrc/model/cbi/mosdns/basic.lua
rename to luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua
diff --git a/luasrc/model/cbi/mosdns/log.lua b/luci-app-mosdns/luasrc/model/cbi/mosdns/log.lua
similarity index 100%
rename from luasrc/model/cbi/mosdns/log.lua
rename to luci-app-mosdns/luasrc/model/cbi/mosdns/log.lua
diff --git a/luasrc/model/cbi/mosdns/rule_list.lua b/luci-app-mosdns/luasrc/model/cbi/mosdns/rule_list.lua
similarity index 100%
rename from luasrc/model/cbi/mosdns/rule_list.lua
rename to luci-app-mosdns/luasrc/model/cbi/mosdns/rule_list.lua
diff --git a/luasrc/model/cbi/mosdns/update.lua b/luci-app-mosdns/luasrc/model/cbi/mosdns/update.lua
similarity index 100%
rename from luasrc/model/cbi/mosdns/update.lua
rename to luci-app-mosdns/luasrc/model/cbi/mosdns/update.lua
diff --git a/luasrc/view/mosdns/mosdns_log.htm b/luci-app-mosdns/luasrc/view/mosdns/mosdns_log.htm
similarity index 100%
rename from luasrc/view/mosdns/mosdns_log.htm
rename to luci-app-mosdns/luasrc/view/mosdns/mosdns_log.htm
diff --git a/luasrc/view/mosdns/mosdns_status.htm b/luci-app-mosdns/luasrc/view/mosdns/mosdns_status.htm
similarity index 100%
rename from luasrc/view/mosdns/mosdns_status.htm
rename to luci-app-mosdns/luasrc/view/mosdns/mosdns_status.htm
diff --git a/po/zh-cn/mosdns.po b/luci-app-mosdns/po/zh-cn/mosdns.po
similarity index 100%
rename from po/zh-cn/mosdns.po
rename to luci-app-mosdns/po/zh-cn/mosdns.po
diff --git a/po/zh_Hans b/luci-app-mosdns/po/zh_Hans
similarity index 100%
rename from po/zh_Hans
rename to luci-app-mosdns/po/zh_Hans
diff --git a/root/etc/config/mosdns b/luci-app-mosdns/root/etc/config/mosdns
similarity index 100%
rename from root/etc/config/mosdns
rename to luci-app-mosdns/root/etc/config/mosdns
diff --git a/root/etc/hotplug.d/iface/99-mosdns b/luci-app-mosdns/root/etc/hotplug.d/iface/99-mosdns
similarity index 100%
rename from root/etc/hotplug.d/iface/99-mosdns
rename to luci-app-mosdns/root/etc/hotplug.d/iface/99-mosdns
diff --git a/root/etc/init.d/mosdns b/luci-app-mosdns/root/etc/init.d/mosdns
similarity index 100%
rename from root/etc/init.d/mosdns
rename to luci-app-mosdns/root/etc/init.d/mosdns
diff --git a/root/etc/mosdns/config.yaml b/luci-app-mosdns/root/etc/mosdns/config.yaml
similarity index 100%
rename from root/etc/mosdns/config.yaml
rename to luci-app-mosdns/root/etc/mosdns/config.yaml
diff --git a/root/etc/mosdns/config_custom.yaml b/luci-app-mosdns/root/etc/mosdns/config_custom.yaml
similarity index 100%
rename from root/etc/mosdns/config_custom.yaml
rename to luci-app-mosdns/root/etc/mosdns/config_custom.yaml
diff --git a/root/etc/mosdns/rule/blocklist.txt b/luci-app-mosdns/root/etc/mosdns/rule/blocklist.txt
similarity index 100%
rename from root/etc/mosdns/rule/blocklist.txt
rename to luci-app-mosdns/root/etc/mosdns/rule/blocklist.txt
diff --git a/root/etc/mosdns/rule/hosts.txt b/luci-app-mosdns/root/etc/mosdns/rule/hosts.txt
similarity index 100%
rename from root/etc/mosdns/rule/hosts.txt
rename to luci-app-mosdns/root/etc/mosdns/rule/hosts.txt
diff --git a/root/etc/mosdns/rule/redirect.txt b/luci-app-mosdns/root/etc/mosdns/rule/redirect.txt
similarity index 100%
rename from root/etc/mosdns/rule/redirect.txt
rename to luci-app-mosdns/root/etc/mosdns/rule/redirect.txt
diff --git a/root/etc/mosdns/rule/whitelist.txt b/luci-app-mosdns/root/etc/mosdns/rule/whitelist.txt
similarity index 100%
rename from root/etc/mosdns/rule/whitelist.txt
rename to luci-app-mosdns/root/etc/mosdns/rule/whitelist.txt
diff --git a/root/etc/uci-defaults/luci-mosdns b/luci-app-mosdns/root/etc/uci-defaults/luci-mosdns
similarity index 100%
rename from root/etc/uci-defaults/luci-mosdns
rename to luci-app-mosdns/root/etc/uci-defaults/luci-mosdns
diff --git a/root/usr/share/mosdns/ad_domain.sh b/luci-app-mosdns/root/usr/share/mosdns/ad_domain.sh
similarity index 100%
rename from root/usr/share/mosdns/ad_domain.sh
rename to luci-app-mosdns/root/usr/share/mosdns/ad_domain.sh
diff --git a/root/usr/share/mosdns/dns.sh b/luci-app-mosdns/root/usr/share/mosdns/dns.sh
similarity index 100%
rename from root/usr/share/mosdns/dns.sh
rename to luci-app-mosdns/root/usr/share/mosdns/dns.sh
diff --git a/root/usr/share/mosdns/library.sh b/luci-app-mosdns/root/usr/share/mosdns/library.sh
similarity index 100%
rename from root/usr/share/mosdns/library.sh
rename to luci-app-mosdns/root/usr/share/mosdns/library.sh
diff --git a/root/usr/share/mosdns/update_geodat.sh b/luci-app-mosdns/root/usr/share/mosdns/update_geodat.sh
similarity index 100%
rename from root/usr/share/mosdns/update_geodat.sh
rename to luci-app-mosdns/root/usr/share/mosdns/update_geodat.sh
diff --git a/root/usr/share/rpcd/acl.d/luci-app-mosdns.json b/luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json
similarity index 100%
rename from root/usr/share/rpcd/acl.d/luci-app-mosdns.json
rename to luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json
diff --git a/mosdns/Makefile b/mosdns/Makefile
new file mode 100644
index 0000000..7d45f99
--- /dev/null
+++ b/mosdns/Makefile
@@ -0,0 +1,45 @@
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2021 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mosdns
+PKG_VERSION:=3.7.3
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/IrineSistiana/mosdns/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=390307079ca7552cd3484941d523f1b29103d21cd71ed4aa15b8e42387775e04
+
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILE:=LICENSE
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/IrineSistiana/mosdns
+GO_PKG_LDFLAGS_X:=main.version=v$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
+
+define Package/mosdns
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=IP Addresses and Names
+  TITLE:=A plug-in DNS forwarder/splitter
+  URL:=https://github.com/IrineSistiana/mosdns
+  DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle
+endef
+
+GO_PKG_TARGET_VARS:=$(filter-out CGO_ENABLED=%,$(GO_PKG_TARGET_VARS)) CGO_ENABLED=0
+
+define Package/mosdns/install
+	$(call GoPackage/Package/Install/Bin,$(1))
+endef
+
+$(eval $(call GoBinPackage,mosdns))
+$(eval $(call BuildPackage,mosdns))