diff --git services/univention-samba4/conffiles/etc/samba/smb.conf.d/10global services/univention-samba4/conffiles/etc/samba/smb.conf.d/10global
index 0791411..720ff25 100644
--- services/univention-samba4/conffiles/etc/samba/smb.conf.d/10global
+++ services/univention-samba4/conffiles/etc/samba/smb.conf.d/10global
@@ -15,9 +15,11 @@ else:
 samba4_role = configRegistry.get('samba4/role')
 if samba4_role in ('DC', 'RODC'):
 	print '\tserver role\t= active directory domain controller'
+	print '\tname resolve order\t=', configRegistry.get('samba/name/resolve/order', 'wins host bcast')
 elif samba4_role == 'MEMBER':
 	print '\tserver role\t= member server'
 	print '\tsecurity\t= ads'
+	print '\tname resolve order\t=', configRegistry.get('samba/name/resolve/order', 'wins bcast')
 
 samba_serverstring = configRegistry.get('samba/serverstring', 'Univention Corporate Server')
 print '\tserver string\t=', samba_serverstring
diff --git services/univention-samba4/debian/univention-samba4.univention-config-registry-variables services/univention-samba4/debian/univention-samba4.univention-config-registry-variables
index 05ceb46..97b0e3c 100644
--- services/univention-samba4/debian/univention-samba4.univention-config-registry-variables
+++ services/univention-samba4/debian/univention-samba4.univention-config-registry-variables
@@ -505,3 +505,9 @@ Description[de]=Über diese Variable lässt sich die Samba Option "server signin
 Description[en]=This variable can be used to adjust the Samba option "server signing" (see man smb.conf).
 Type=str
 Categories=service-samba
+
+[samba/name/resolve/order]
+Description[de]=Über diese Variable lässt sich die Samba Option "name resolve order" anpassen (siehe man smb.conf). Ist die Rolle als DC oder RODC konfiguriert, ist der UCS default "wins host bcast". Ist die Rolle MEMBER, wird als Standardwert "wins bcast" verwendet.
+Description[en]=This variable can be used to adjust the Samba option "name resolve order" (see man smb.conf). If the role is configured as DC or RODC, the UCS default is "wins host bcast". If the role MEMBER is configured, "wins bcast" is the default value.
+Type=str
+Categories=service-samba
\ No newline at end of file