diff --git a/Changes b/Changes
index 4947446b4..34b0b0989 100644
--- a/Changes
+++ b/Changes
@@ -3051,3 +3051,5 @@ seen. gmtime warning still there
   raistlinmajere (#0001592)
 - Fixed a problem with /stats S and extended channel modes (#0001675) reported by
   AngryWolf
+- Fixed a resolver problem that could cause hosts to not be resolved on some Windows
+  systems
diff --git a/src/res_init.c b/src/res_init.c
index e699ff7df..24a4936e3 100644
--- a/src/res_init.c
+++ b/src/res_init.c
@@ -409,7 +409,7 @@ void get_res_from_reg_nt()
 		{
 			do {
 				n = 0;
-				while (*cp && *cp != ' ' && *cp != '\t')
+				while (*cp && *cp != ' ' && *cp != '\t' && *cp != ',')
 					++cp;
 				if (*cp)
 				{