diff --git a/net/wsdd2/Makefile b/net/wsdd2/Makefile
index 1fbd09e6d..e3aee93d0 100644
--- a/net/wsdd2/Makefile
+++ b/net/wsdd2/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/Andy2244/wsdd2.git
-PKG_SOURCE_DATE:=2020-05-06
-PKG_SOURCE_VERSION:=671d040c33ec290930535e27dd59c1e5ccec11ec
-PKG_MIRROR_HASH:=aac0881ba8627897b23906eabde97450178a8f9285699c0368f88a745a934b96
+PKG_SOURCE_DATE:=2020-11-19
+PKG_SOURCE_VERSION:=e0cf50d5c125d60caaa9b957d058ea4348a8d200
+PKG_MIRROR_HASH:=6a09fed7974de3e9c6f87c0b2880c105a21ffaef965bd58d837d62ca58fe8f07
 
 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=GPL-3.0-only
diff --git a/net/wsdd2/files/wsdd2.init b/net/wsdd2/files/wsdd2.init
index ca9653d6c..d86c65861 100644
--- a/net/wsdd2/files/wsdd2.init
+++ b/net/wsdd2/files/wsdd2.init
@@ -29,13 +29,22 @@ start_service() {
 		logger -p daemon.error -t 'wsdd2' "samba36/4 or ksmbd is not running, can't start wsdd2!"
 		exit 1
 	}
+	
+	# cleanup comments
+	local smb_conf
+	smb_conf="$(grep '^[[:blank:]]*[^[:blank:]#;]' $SMB_CONF)"
 
 	local nb_name
-	nb_name="$(grep -i 'netbios name' $SMB_CONF | awk -F'=' '{print $2}' | tr -d ' \n')"
+	nb_name="$(echo "$smb_conf" | grep -i 'netbios name' | awk -F'=' '{print $2}' | tr -d ' \n')"
 	[ -n "$nb_name" ] && NB_PARM="$nb_name"
 
+	# use uppercase for none mdns option
+	local nb_option
+	nb_option="$(echo "$smb_conf" | grep -i 'mdns name' | awk -F'=' '{print $2}' | tr -d ' \n')"
+	[ "$nb_option" != "mdns" ] && NB_PARM="$(echo "$nb_name" | awk '{print toupper($0)}')"
+
 	local wg_name
-	wg_name="$(grep -i 'workgroup' $SMB_CONF | awk -F'=' '{print $2}' | tr -d ' \n')"
+	wg_name="$(echo "$smb_conf" | grep -i 'workgroup' | awk -F'=' '{print $2}' | tr -d ' \n')"
 	[ -n "$wg_name" ] && WG_PARM="$wg_name"
 
 	# resolve lan interface (BUG: No multi-interface binds atm)