diff --git a/conf.default/config.xml b/conf.default/config.xml
index 9d6a19dafc..668e599903 100644
--- a/conf.default/config.xml
+++ b/conf.default/config.xml
@@ -139,7 +139,7 @@
 	<system>
 		<optimization>normal</optimization>
 		<hostname>pfSense</hostname>
-		<domain>local</domain>
+		<domain>localdomain</domain>
 		<dnsserver></dnsserver>
 		<dnsallowoverride/>
 		<group>
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index 7a4b0bef6c..2ee3f520f2 100755
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -252,7 +252,7 @@ include("head.inc");
 					<br/>
 					<span class="vexpl">
 						name of the firewall host, without domain part
-						<br>
+						<br/>
 						e.g. <em>firewall</em>
 					</span>
 				</td>
@@ -262,6 +262,8 @@ include("head.inc");
 				<td width="78%" class="vtable"> <input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>">
 					<br/>
 					<span class="vexpl">
+						Do not use "local" as a domain name. It will cause local hosts running mDNS (avahi, bonjour, etc.) to be unable to resolve local hosts not running mDNS.
+						<br/>
 						e.g. <em>mycorp.com</em>
 					</span>
 				</td>