diff --git a/udpecho/Makefile b/udpecho/Makefile
index 55be4a0cc..5b8004bfe 100755
--- a/udpecho/Makefile
+++ b/udpecho/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpecho
-PKG_VERSION:=2.2.0
+PKG_VERSION:=2.2.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -26,6 +26,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
 
 MAKE_PATH:=src
 
@@ -64,13 +65,12 @@ endif
 
 define Package/$(PKG_NAME)-server/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/udpechoserverd $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/libudpechoserver.so $(1)/usr/lib/bbfdm/
 	$(INSTALL_DATA) ./files/etc/config/udpechoserver $(1)/etc/config/udpechoserver
 	$(INSTALL_BIN) ./files/etc/init.d/udpechoserverd $(1)/etc/init.d/udpechoserverd
+	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/src/libudpechoserver.so)
 endef
 
 define Package/$(PKG_NAME)-client/install