diff --git a/debian/changelog b/debian/changelog
index dfd414b5..7ebfb882 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 fail2ban (0.8.0-5~pre1) unstable; urgency=low
 
   * Added optional spaces at the end of failregex for vsftpd.
+  * Resolve all "names" which became a part of <HOST>. Previousely only fqdn's
+    were resolved
 
  -- Yaroslav Halchenko <debian@onerussian.com>  Sun, 05 Aug 2007 21:38:44 -0400
 
diff --git a/debian/patches/00_resolve_all_names.dpatch b/debian/patches/00_resolve_all_names.dpatch
new file mode 100755
index 00000000..962080e6
--- /dev/null
+++ b/debian/patches/00_resolve_all_names.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_resolve_all_names.dpatch by Yaroslav Halchenko <debian@onerussian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad trunk~/server/filter.py trunk/server/filter.py
+--- trunk~/server/filter.py	2007-04-18 16:44:07.000000000 -0400
++++ trunk/server/filter.py	2007-08-06 14:20:11.000000000 -0400
+@@ -538,11 +538,14 @@
+ 				ipList.append(plainIPStr)
+ 		if not ipList:
+ 			# Try to get IP from possible DNS
+-			dns = DNSUtils.textToDns(text)
+-			if not dns == None:
+-				ip = DNSUtils.dnsToIp(dns.group(0))
+-				for e in ip:
+-					ipList.append(e)
++			# yoh: this way would not work for reported
++			# hosts with only top part of the address
++			# Since we have now <HOST> it is safe and
++			# efficient to simply try to resolve it
++			# dns = DNSUtils.textToDns(text)
++			ip = DNSUtils.dnsToIp(text)
++			for e in ip:
++				ipList.append(e)
+ 		return ipList
+ 	
+ 	@staticmethod
diff --git a/debian/patches/00list b/debian/patches/00list
index d7682772..4c770b12 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,6 +3,7 @@
 00_var_run_socket
 00_HOST_ignoreregex
 00_daemon_pids
+00_resolve_all_names
 10_dbts_manpages
 00_iptables_allports
 00_ssh_strong_re