diff --git a/bcmkernel/416030.mk b/bcmkernel/416030.mk
index 5c9e0336c..b8157cdeb 100644
--- a/bcmkernel/416030.mk
+++ b/bcmkernel/416030.mk
@@ -13,10 +13,10 @@ PKG_NAME:=bcmkernel-3.4
 PKG_VERSION:=$(BRCM_SDK_VERSION)
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=git@iopsys.inteno.se:bcmkernel-4.16L.03
+PKG_SOURCE_URL:=git@iopsys.inteno.se:bcmkernel
 PKG_SOURCE_PROTO:=git
 
-PKG_SOURCE_VERSION:=205c1d7bdd24388e0bae8c2883ac83ca0b1e5458
+PKG_SOURCE_VERSION:=080f1533553e7341e48995e7f9024cbf79a24120
 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_SDK_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 endif
 
diff --git a/bcmkernel/416040.mk b/bcmkernel/416040.mk
index 9140a1c1e..e388c1a74 100644
--- a/bcmkernel/416040.mk
+++ b/bcmkernel/416040.mk
@@ -16,7 +16,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_URL:=git@iopsys.inteno.se:bcmkernel
 PKG_SOURCE_PROTO:=git
 
-PKG_SOURCE_VERSION:=963801c26cf4c86c53952a28e806cc233e5b62be
+PKG_SOURCE_VERSION:=8ad4bbc5479a2b0d0de9a6334f4f5c9ed4f7df53
 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_SDK_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 endif
 
diff --git a/dectmngr/Makefile b/dectmngr/Makefile
index 50f599e0f..94f295894 100644
--- a/dectmngr/Makefile
+++ b/dectmngr/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.23
+PKG_VERSION:=1.0.24
 ifeq ($(CONFIG_BCM_OPEN),y)
 PKG_SOURCE_URL:=http://ihgsp.inteno.se/git/dectmngr.git
 else
 PKG_SOURCE_URL:=git@iopsys.inteno.se:dectmngr.git
 endif
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5f6f0608b59484d76c6331279cc50104be5d8a95
+PKG_SOURCE_VERSION:=6ba403663bc9cfdb8f89fb34de367f0796d68552
 PKG_NAME:=dectmngr
 
 
diff --git a/dectmngr/files/etc/dect/dect_testmode.dat b/dectmngr/files/etc/dect/dect_testmode.dat
new file mode 100644
index 000000000..c82982aa6
Binary files /dev/null and b/dectmngr/files/etc/dect/dect_testmode.dat differ
diff --git a/dectmngr/files/etc/init.d/dect b/dectmngr/files/etc/init.d/dect
index 11c22fd2b..000209295 100755
--- a/dectmngr/files/etc/init.d/dect
+++ b/dectmngr/files/etc/init.d/dect
@@ -19,9 +19,9 @@ start_service() {
 	cat /proc/nvram/bcm_def_freq | tr -d ' ' | atohx > /tmp/bcm_def_freq
 	DECTANTDIV=`db get hw.board.DectAntennaDiversity`
 	case "$DECTANTDIV" in
-		1|off) echo -e "\x01" > /tmp/dect_antenna_diversity ;;
-		2) echo -e "\x02" > /tmp/dect_antenna_diversity ;;
-		*) echo -e "\x00" > /tmp/dect_antenna_diversity ;;
+		1|off) echo -ne "\x01" > /tmp/dect_antenna_diversity ;;
+		2) echo -ne "\x02" > /tmp/dect_antenna_diversity ;;
+		*) echo -ne "\x00" > /tmp/dect_antenna_diversity ;;
 	esac
 
 	if [ ! -f /etc/dect/nvs ]; then
@@ -29,7 +29,7 @@ start_service() {
 		dd of=/etc/dect/nvs if=/tmp/rfpi conv=notrunc bs=1 seek=0
 		dd of=/etc/dect/nvs if=/tmp/fixed_emc conv=notrunc bs=1 seek=10
 		dd of=/etc/dect/nvs if=/tmp/bcm_def_freq conv=notrunc bs=1 seek=6
-		dd of=/etc/dect/nvs if=/tmp/dect_antenna_diversity conv=notrunc bs=1 seek=34
+		dd of=/etc/dect/nvs if=/tmp/dect_antenna_diversity conv=notrunc bs=1 seek=32
 	fi
 	
 	# init dectproxy
diff --git a/icwmp/Makefile b/icwmp/Makefile
index b1b1925c4..965fb5b67 100644
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2015-11-10
+PKG_VERSION:=3.0-2015-11-16
 PKG_FIXUP:=autoreconf
 ifeq ($(CONFIG_BCM_OPEN),y)
 PKG_SOURCE_URL:=http://ihgsp.inteno.se/git/freecwmp.git
@@ -16,7 +16,7 @@ else
 PKG_SOURCE_URL:=ssh://git@iopsys.inteno.se/freecwmp.git
 endif
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8d34c241548a21b6462df5d16906824685fe916c
+PKG_SOURCE_VERSION:=ff17478c46fd49f4354ba6b27cdd002f55346cc6
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -140,7 +140,6 @@ ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/icwmp.sh $(1)/usr/sbin/icwmp
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/iwepkeygen $(1)/usr/sbin/iwepkeygen
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/watchicwmpd.sh $(1)/usr/sbin/watchicwmpd
 endif
 endef
 
diff --git a/iup/files/sbin/iup b/iup/files/sbin/iup
index 76bbf9dad..ab1ad0cc9 100755
--- a/iup/files/sbin/iup
+++ b/iup/files/sbin/iup
@@ -112,7 +112,12 @@ handle_provisioning() {
 	config_get_bool defaultreset "$config" defaultreset
 	config_get deckey "$config" deckey
 	if [ "$enabled" -eq 1	]; then
-		config_get url "$config" urliup
+		if [ "$config" == "iup" ]; then
+			v "using url from dhcp options"
+			config_get url "$config" urliup
+		else 
+			config_get url "$config" url
+		fi
 		url=${url//\$MAC/$MAC}
 		v "Download from $url"
 		  
diff --git a/voice-client/files/etc/uci-defaults/99-voice_client b/voice-client/files/etc/uci-defaults/99-voice_client
new file mode 100755
index 000000000..8b1f84410
--- /dev/null
+++ b/voice-client/files/etc/uci-defaults/99-voice_client
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+uci -q get voice_client.RINGING_STATUS >/dev/null && exit 0
+
+uci -q batch <<-EOT
+	add voice_client ringing_status
+	rename voice_client.@ringing_status[-1]=RINGING_STATUS
+	set voice_client.RINGING_STATUS.status=0
+	set voice_client.RINGING_STATUS.enabled=1
+	set voice_client.RINGING_STATUS.shouldring=1
+	commit voice_client
+EOT
+
+exit 0
+
diff --git a/webgui/luci/luci/Makefile b/webgui/luci/luci/Makefile
index 82a452e6c..dee377da8 100644
--- a/webgui/luci/luci/Makefile
+++ b/webgui/luci/luci/Makefile
@@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_BRANCH:=svn-0.11
 PKG_NAME:=luci
-PKG_VERSION:=inteno-1.1.20
-PKG_SOURCE_VERSION:=b0d5916e7ae00a87d94aab531449b46cb8233893
+PKG_VERSION:=inteno-1.1.21
+PKG_SOURCE_VERSION:=1bb632b4f87a0ce3b24ab177496e2fa4f4daf955
 
 PKG_SOURCE_PROTO:=git
 ifeq ($(CONFIG_BCM_OPEN),y)