diff --git a/sulu-builder/Makefile b/sulu-builder/Makefile
index a68f09115..68a17ff03 100644
--- a/sulu-builder/Makefile
+++ b/sulu-builder/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=1.3.18
+PKG_VERSION:=1.3.19
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
diff --git a/sulu-builder/files/etc/sulu/sulu.sh b/sulu-builder/files/etc/sulu/sulu.sh
index 30d2dabc1..ad50d39c5 100644
--- a/sulu-builder/files/etc/sulu/sulu.sh
+++ b/sulu-builder/files/etc/sulu/sulu.sh
@@ -20,10 +20,10 @@ function _get_agent_id()
 	if [ -z "${endpointid}" ]; then
 		oui="$(db -q get device.deviceinfo.ManufacturerOUI)"
 		serial="$(db -q get device.deviceinfo.SerialNumber)"
-		echo "${oui}-${serial/+/%2B}"
+		echo "${oui}-${serial//+/%2B}"
 	else
 		endpointid="$(echo "${endpointid/::/,}"|cut -d "," -f 2)"
-		endpointid="${endpointid/+/%2B}"
+		endpointid="${endpointid//+/%2B}"
 	fi
 }
 
@@ -35,9 +35,9 @@ function _get_endpoint_id()
 	if [ -z "${endpointid}" ]; then
 		oui="$(db -q get device.deviceinfo.ManufacturerOUI)"
 		serial="$(db -q get device.deviceinfo.SerialNumber)"
-		echo "os::${oui}-${serial/+/%2B}"
+		echo "os::${oui}-${serial//+/%2B}"
 	else
-		echo "${endpointid/+/%2B}"
+		echo "${endpointid//+/%2B}"
 	fi
 }
 
diff --git a/sulu/Makefile b/sulu/Makefile
index 7d69925cc..afd0d975d 100644
--- a/sulu/Makefile
+++ b/sulu/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.3.18
+PKG_VERSION:=1.3.19
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
diff --git a/sulu/files/etc/sulu/sulu.sh b/sulu/files/etc/sulu/sulu.sh
index 30d2dabc1..ad50d39c5 100644
--- a/sulu/files/etc/sulu/sulu.sh
+++ b/sulu/files/etc/sulu/sulu.sh
@@ -20,10 +20,10 @@ function _get_agent_id()
 	if [ -z "${endpointid}" ]; then
 		oui="$(db -q get device.deviceinfo.ManufacturerOUI)"
 		serial="$(db -q get device.deviceinfo.SerialNumber)"
-		echo "${oui}-${serial/+/%2B}"
+		echo "${oui}-${serial//+/%2B}"
 	else
 		endpointid="$(echo "${endpointid/::/,}"|cut -d "," -f 2)"
-		endpointid="${endpointid/+/%2B}"
+		endpointid="${endpointid//+/%2B}"
 	fi
 }
 
@@ -35,9 +35,9 @@ function _get_endpoint_id()
 	if [ -z "${endpointid}" ]; then
 		oui="$(db -q get device.deviceinfo.ManufacturerOUI)"
 		serial="$(db -q get device.deviceinfo.SerialNumber)"
-		echo "os::${oui}-${serial/+/%2B}"
+		echo "os::${oui}-${serial//+/%2B}"
 	else
-		echo "${endpointid/+/%2B}"
+		echo "${endpointid//+/%2B}"
 	fi
 }