diff --git a/xmppc/Makefile b/xmppc/Makefile
index b5e393993..9204d94ec 100755
--- a/xmppc/Makefile
+++ b/xmppc/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=2.2.2
+PKG_VERSION:=2.2.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=205d6879807b40c184c457df3cc841440515731b
+PKG_SOURCE_VERSION:=23a7f6005b84fc4d4a1432057ecd2b5a74f9ea3e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -35,7 +35,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF xmpp Client
-  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbfdm-api
+  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbfdm-api +@CONFIG_BUSYBOX_CONFIG_PIDOF
 endef
 
 define Package/$(PKG_NAME)/description
diff --git a/xmppc/files/etc/config/xmpp b/xmppc/files/etc/config/xmpp
index ced9a0417..fac00522b 100644
--- a/xmppc/files/etc/config/xmpp
+++ b/xmppc/files/etc/config/xmpp
@@ -1,37 +1,5 @@
 
 config xmpp 'xmpp'
-	option conn_req_connection 'connection_1'
-	option allowed_jid ''
 	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
 	option loglevel '3'
 
-config connection 'connection_1'
-	option enable '0'
-	option username ''
-	option password ''
-	option domain 	''
-	option resource ''
-	option usetls '0'
-	option interval '30'
-	option attempt '16'
-	option initial_retry_interval '1'
-	option retry_interval_multiplier '1000'
-	option retry_max_interval '1'
-	option serveralgorithm 'DNS-SRV'
-	
-config connection_server 'connection_1_srv_1'
-	option con_name 'connection_1'
-	option enable '0'
-	option priority '0'
-	option weight '-1'
-	option port '5222'
-	option server_address ''
-
-config connection_server 'connection_1_srv_2'
-	option con_name 'connection_1'
-	option enable '0'
-	option priority '0'
-	option weight '-1'
-	option port '5222'
-	option server_address ''
-
diff --git a/xmppc/files/etc/hotplug.d/iface/91-icwmp_xmpp b/xmppc/files/etc/hotplug.d/iface/91-icwmp_xmpp
index 0219bc13d..7813abd6f 100644
--- a/xmppc/files/etc/hotplug.d/iface/91-icwmp_xmpp
+++ b/xmppc/files/etc/hotplug.d/iface/91-icwmp_xmpp
@@ -17,5 +17,8 @@ PROTO="$(uci -q get network."${INTERFACE}".proto)"
 IFNAME="$(uci -q get network."${INTERFACE}".ifname)"
 [ "${IFNAME:0:1}" = "@" ] && exit 0
 
-/etc/init.d/xmppc reload &
+# reload xmppc if not running already
+if ! pidof xmppc; then
+	/etc/init.d/xmppc reload &
+fi
 
diff --git a/xmppc/files/etc/init.d/xmppc b/xmppc/files/etc/init.d/xmppc
index 2f7161d3e..537c53af3 100755
--- a/xmppc/files/etc/init.d/xmppc
+++ b/xmppc/files/etc/init.d/xmppc
@@ -9,12 +9,12 @@ PROG="/usr/sbin/xmppc"
 start_service() {
 	local con_name=$(uci -q get xmpp.xmpp.conn_req_connection)
 	local con_enable=$(uci -q get xmpp."${con_name}".enable)
+
+	procd_open_instance
 	if [ "$con_enable" = "1" ]; then
-		procd_open_instance
 		procd_set_param command "$PROG"
-		procd_set_param respawn "3" "7" "0"
-		procd_close_instance
 	fi
+	procd_close_instance
 }
 
 reload_service() {