diff --git a/owsd/Makefile b/owsd/Makefile
index e569f0de3..1c3356c33 100644
--- a/owsd/Makefile
+++ b/owsd/Makefile
@@ -10,7 +10,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=1c6efa76a23b9a8236a8f6d3b43349cf1e23655a
+PKG_SOURCE_VERSION:=a479a50e354986aac6ec94dad7baedadad1347fd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
diff --git a/owsd/files/owsd.init b/owsd/files/owsd.init
index 3891f5f81..70d5de657 100644
--- a/owsd/files/owsd.init
+++ b/owsd/files/owsd.init
@@ -203,12 +203,12 @@ parse_owsd_iface() {
 		config_list_foreach "$1" "origin" append_str
 
 		# uncomment code below when implementing one vhost per origin fix
-		#[ -n "$2" ] && whitelist_all_origins=1
+		[ -n "$2" ] && whitelist_all_origins=1
 
-		#if [ "$whitelist_all_origins" -eq 1 ]; then
-		#	whitelist_dhcp_domains=1
-		#	whitelist_interface_as_origin=1
-		#fi
+		if [ "$whitelist_all_origins" -eq 1 ]; then
+			whitelist_dhcp_domains=1
+			whitelist_interface_as_origin=1
+		fi
 
 		if [ "$whitelist_dhcp_domains" -eq 1 ]; then
 			for domain in $DHCP_DOMAINS; do