diff --git a/package/lean/openwrt-frp/Makefile b/package/lean/openwrt-frp/Makefile
index b6ae77de3d..f9c068234e 100644
--- a/package/lean/openwrt-frp/Makefile
+++ b/package/lean/openwrt-frp/Makefile
@@ -1,23 +1,16 @@
-#
-# Copyright (C) 2019 Xingwang Liao
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openwrt-frp
 PKG_VERSION:=0.31.2
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)?
+PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v${PKG_VERSION}?
 PKG_HASH:=790a18f5651cc645a3d73fc147c719f5b212fc21db0c51c620011ee836b7a28f
 
+PKG_MAINTAINER:=Richard Yu <yurichard3839@gmail.com>
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
@@ -26,43 +19,57 @@ PKG_USE_MIPS16:=0
 GO_PKG:=github.com/fatedier/frp
 GO_PKG_BUILD_PKG:=github.com/fatedier/frp/cmd/...
 
-GO_PKG_LDFLAGS:=-s -w
-
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
-define openwrt-frp/templates
-  define Package/openwrt-$(1)
-    TITLE:=A fast reverse proxy ($(1))
-    URL:=https://github.com/fatedier/frp
-    SECTION:=net
-    CATEGORY:=Network
-    SUBMENU:=Web Servers/Proxies
-    DEPENDS:=$$(GO_ARCH_DEPENDS)
-  endef
-
-  define Package/openwrt-$(1)/description
-  frp is a fast reverse proxy to help you expose a local server behind a NAT or firewall
-  to the internet. As of now, it supports tcp & udp, as well as httpand https protocols,
-  where requests can be forwarded to internal services by domain name.
-
-  This package contains the $(1).
-  endef
-
-  define Package/openwrt-$(1)/install
-	$$(call GoPackage/Package/Install/Bin,$$(PKG_INSTALL_DIR))
-
-	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(PKG_INSTALL_DIR)/usr/bin/$(1)
-
-	$$(INSTALL_DIR) $$(1)/usr/bin
-	$$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/
-  endef
+define Package/openwrt-frp/template
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  TITLE:=frp - fast reverse proxy
+  URL:=https://github.com/fatedier/frp
+  DEPENDS:=$(GO_ARCH_DEPENDS)
 endef
 
-FRP_COMPONENTS:=frpc frps
+define Package/openwrt-frpc
+  $(call Package/openwrt-frp/template)
+  TITLE+= (client)
+endef
 
-$(foreach component,$(FRP_COMPONENTS), \
-  $(eval $(call openwrt-frp/templates,$(component))) \
-  $(eval $(call GoBinPackage,$(component))) \
-  $(eval $(call BuildPackage,$(component))) \
-)
+define Package/openwrt-frps
+  $(call Package/openwrt-frp/template)
+  TITLE+= (server)
+endef
+
+define Package/openwrt-frp/description
+  frp is a fast reverse proxy to help you expose a local server behind
+  a NAT or firewall to the internet.
+endef
+Package/openwrt-frpc/description = $(Package/openwrt-frp/description)
+Package/openwrt-frps/description = $(Package/openwrt-frp/description)
+
+define Package/openwrt-frp/install
+	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
+
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/etc/frp/$(2).d/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/$(2)_full.ini $(1)/etc/frp/$(2).d/
+	$(INSTALL_DIR) $(1)/etc/config/
+	$(INSTALL_CONF) ./files/$(2).config $(1)/etc/config/$(2)
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_BIN) ./files/$(2).init $(1)/etc/init.d/$(2)
+endef
+
+define Package/openwrt-frpc/install
+  $(call Package/openwrt-frp/install,$(1),frpc)
+endef
+
+define Package/openwrt-frps/install
+  $(call Package/openwrt-frp/install,$(1),frps)
+endef
+
+$(eval $(call GoBinPackage,openwrt-frpc))
+$(eval $(call BuildPackage,openwrt-frpc))
+$(eval $(call GoBinPackage,openwrt-frps))
+$(eval $(call BuildPackage,openwrt-frps))