diff --git a/Netdisco/Changes b/Netdisco/Changes
index dd8d6a8c..15fcb892 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,4 +1,10 @@
-2.028006
+2.028006 - 2014-07-21
+
+  [BUG FIXES]
+
+  * DNS Mismatch report incorrectly trimmed domain_suffix
+
+2.028006 - 2014-07-21
 
   [ENHANCEMENTS]
 
diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceDnsMismatch.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceDnsMismatch.pm
index 71ac29a1..bde7b768 100644
--- a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceDnsMismatch.pm
+++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DeviceDnsMismatch.pm
@@ -17,9 +17,8 @@ SELECT *
 FROM device
 WHERE dns IS NULL
   OR name IS NULL
-  OR lower(trim(TRAILING ?
-                FROM dns)::text) != lower(trim(TRAILING ?
-                                               FROM name)::text)
+  OR regexp_replace(lower(dns), ? || '$', '')
+    != regexp_replace(lower(name), ? || '$', '')
 ENDSQL
 
 1;