diff --git a/ponmngr/Makefile b/ponmngr/Makefile
index 7b03ce87c..90054ec40 100644
--- a/ponmngr/Makefile
+++ b/ponmngr/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ponmngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -17,11 +17,12 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/ponmngr
 	CATEGORY:=Utilities
-	TITLE:=ponmngr packets manager daemon
+	TITLE:=PON Manager
+	DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
 endef
 
 define Package/ponmngr/description
-	Configures pon
+	Configures PON
 endef
 
 #define Build/Prepare
@@ -32,7 +33,12 @@ define Build/Compile
 endef
 
 define Package/ponmngr/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/common/* $(1)/
+ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
+	$(CP) ./files/broadcom/* $(1)/
+else ifneq ($(CONFIG_TARGET_iopsys_econet),)
+	$(CP) ./files/airoha/* $(1)/
+endif
 endef
 
 $(eval $(call BuildPackage,ponmngr))
diff --git a/ponmngr/files/airoha/lib/xpon/airoha.sh b/ponmngr/files/airoha/lib/xpon/airoha.sh
new file mode 100644
index 000000000..71f83ca4e
--- /dev/null
+++ b/ponmngr/files/airoha/lib/xpon/airoha.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+init_xpon() {
+	# For now use the base mac address as the omci serial number
+	/userfs/bin/omcicfgCmd set sn $(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')
+
+	/userfs/bin/ponmgr_cfg &
+	sleep 1
+	/userfs/bin/omci &
+}
+
+deinit_xpon() {
+	killall -9 omci 2>/dev/null
+	killall -9 ponmgr_cfg 2>/dev/null
+}
+
diff --git a/ponmngr/files/lib/xpon/broadcom.sh b/ponmngr/files/broadcom/lib/xpon/broadcom.sh
similarity index 95%
rename from ponmngr/files/lib/xpon/broadcom.sh
rename to ponmngr/files/broadcom/lib/xpon/broadcom.sh
index ddb72a5da..7ca4be78c 100644
--- a/ponmngr/files/lib/xpon/broadcom.sh
+++ b/ponmngr/files/broadcom/lib/xpon/broadcom.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-USE_PROCD=1
-
 . /lib/functions.sh
 
 init_xpon() {
diff --git a/ponmngr/files/etc/init.d/xpon b/ponmngr/files/common/etc/init.d/xpon
similarity index 97%
rename from ponmngr/files/etc/init.d/xpon
rename to ponmngr/files/common/etc/init.d/xpon
index c9d020a57..1188101e0 100755
--- a/ponmngr/files/etc/init.d/xpon
+++ b/ponmngr/files/common/etc/init.d/xpon
@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=19
-STOP=10
+STOP=91
 
 USE_PROCD=1
 
diff --git a/ponmngr/files/etc/uci-defaults/60-xpon-generate b/ponmngr/files/common/etc/uci-defaults/60-xpon-generate
similarity index 100%
rename from ponmngr/files/etc/uci-defaults/60-xpon-generate
rename to ponmngr/files/common/etc/uci-defaults/60-xpon-generate