diff --git a/libs/fbzmq/Makefile b/libs/fbzmq/Makefile
index ad3d5979a..e6df49ce2 100644
--- a/libs/fbzmq/Makefile
+++ b/libs/fbzmq/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fbzmq
 PKG_VERSION:=2019.06.10.00
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/facebook/fbzmq/tar.gz/v$(PKG_VERSION)?
@@ -13,6 +13,7 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
 CMAKE_SOURCE_SUBDIR:=fbzmq
+PKG_BUILD_DEPENDS:=fbthrift
 PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
@@ -20,28 +21,25 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/fbzmq
-	SECTION:=libs
-	CATEGORY:=Libraries
-	TITLE:=Facebook ZeroMQ wrappers.
-	DEPENDS:=+fbthrift +libzmq +libsigar
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Facebook ZeroMQ wrappers.
+  URL:=https://github.com/facebook/fbzmq
+  DEPENDS:=+libfolly +libzmq +libsigar
 endef
 
 define Package/fbzmq/description
-	Facebook ZeroMQ wrappers.
+  Facebook ZeroMQ wrappers.
 endef
 
 CMAKE_OPTIONS += \
 	-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
 	-DBUILD_TESTS=OFF \
-	-DBUILD_SHARED_LIBS=ON \
 	-DTHRIFT1="$(STAGING_DIR_HOSTPKG)/bin/thrift1" \
 	-DTHRIFT_COMPILER_INCLUDE="$(STAGING_DIR_HOSTPKG)/include/"
 
 TARGET_CXXFLAGS += -faligned-new
-
-define Package/fbzmq/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfbzmq.so* $(1)/usr/lib/
-endef
+TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -flto
+TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
 
 $(eval $(call BuildPackage,fbzmq))