diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index cb7d820f47..fa08d3b26a 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -115,6 +115,7 @@
 		<li>[Fix] Correctly display double-colon on special conditions within highlighted php source (Bug #26795)</li>
 		<li>[Fix] Increase storage capacity of titles/subjects due to specialchared content (Bug #25235)</li>
 		<li>[Fix] Catch invalid username wildcard ban (we do not support these) (Bug #29305)</li>
+		<li>[Fix] Fix (email)-domain checks for those having DNS prefixes set (Bug #29635)</li>
 		<li>[Change] Adjust truncate_string() to be able to adjust the maximum storage length.</li>
 		<li>[Change] Generalize load check (Bug #21255 / thanks to Xipher)</li>
 		<li>[Change] Make utf8_htmlspecialchars not pass its argument by reference (Bug #21885)</li>
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index be3dac3449..8c194f4fc2 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2884,7 +2884,7 @@ function phpbb_checkdnsrr($host, $type = '')
 		}
 
 		// @exec('nslookup -retry=1 -timout=1 -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output);
-		@exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output);
+		@exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host) . '.', $output);
 
 		// If output is empty, the nslookup failed
 		if (empty($output))
@@ -2910,7 +2910,8 @@ function phpbb_checkdnsrr($host, $type = '')
 	}
 	else if (function_exists('checkdnsrr'))
 	{
-		return (checkdnsrr($host, $type)) ? true : false;
+		// The dot indicates to search the DNS root (helps those having DNS prefixes on the same domain)
+		return (checkdnsrr($host . '.', $type)) ? true : false;
 	}
 
 	return NULL;