diff --git a/Changes b/Changes
index 607f38bb4..b73447172 100644
--- a/Changes
+++ b/Changes
@@ -1604,3 +1604,4 @@ seen. gmtime warning still there
 - Fixed bug #0000371 reported by havlaz about an extra \n slipped in with the TKL notice
 - Fixed bug with all TKL commands not accepting nicks anymore (#0000370 reported by Ravage)
 - Fixed bug #0000342 reported by James LiGate about tokens leaking through from clients
+- Removed some IPv6 resolver specifics that seemed illogical (reference to Jollino's IPv6 crashes)
diff --git a/src/res.c b/src/res.c
index 5d63cf771..c672cb6be 100644
--- a/src/res.c
+++ b/src/res.c
@@ -1283,30 +1283,17 @@ static void update_list(ResRQ *rptr, aCache *cachep)
 			base[addrcount] = NULL;
 		}
 	}
-#ifdef INET6
 	for (i = 0; HE(cp)->h_addr_list[i]; i++)
-#else
-	for (i = 0; &HE(cp)->h_addr_list[i]; i++)
-#endif
 		;
 	addrcount = i;
 
 	/*
 	 * Do the same again for IP#'s.
 	 */
-#ifdef INET6
 	for (s = (char *)HE(rptr)->h_addr.S_ADDR;
 	    ((struct IN_ADDR *)s)->S_ADDR; s += sizeof(struct IN_ADDR))
-#else
-	for (s = (char *)&HE(rptr)->h_addr.S_ADDR;
-	    ((struct IN_ADDR *)s)->S_ADDR; s += sizeof(struct IN_ADDR))
-#endif
 	{
-#ifdef INET6
 		for (i = 0; (t = HE(cp)->h_addr_list[i]); i++)
-#else
-		for (i = 0; (t = HE(cp)->h_addr_list[i]); i++)
-#endif
 			if (!bcmp(s, t, sizeof(struct IN_ADDR)))
 				break;
 		if (i >= MAXADDRS || addrcount >= MAXADDRS)
@@ -1330,10 +1317,12 @@ static void update_list(ResRQ *rptr, aCache *cachep)
 			base = (char **)MyRealloc((char *)ab,
 			    (addrcount + 1) * sizeof(*ab));
 			HE(cp)->h_addr_list = base;
+#ifndef INET6
 #ifdef	DEBUGMODE
 			Debug((DEBUG_DNS, "u_l:add IP %x hal %x ac %d",
 			    ntohl(((struct IN_ADDR *)s)->S_ADDR),
 			    HE(cp)->h_addr_list, addrcount));
+#endif
 #endif
 			for (; addrcount; addrcount--)
 			{
@@ -1418,11 +1407,7 @@ static aCache *find_cache_number(ResRQ *rptr, char *numb)
 #endif
 	for (; cp; cp = cp->hnum_next)
 	{
-#ifdef INET6
 		for (i = 0; HE(cp)->h_addr_list[i]; i++)
-#else
-		for (i = 0; HE(cp)->h_addr_list[i]; i++)
-#endif
 		{
 			if (!bcmp(HE(cp)->h_addr_list[i], numb,
 			    sizeof(struct IN_ADDR)))
@@ -1444,11 +1429,7 @@ static aCache *find_cache_number(ResRQ *rptr, char *numb)
 		 * single address entry...would have been done by hashed
 		 * search above...
 		 */
-#ifdef INET6
 		if (!HE(cp)->h_addr_list[1])
-#else
-		if (!HE(cp)->h_addr_list[1])
-#endif
 			continue;
 		/*
 		 * if the first IP# has the same hashnumber as the IP# we
@@ -1456,11 +1437,7 @@ static aCache *find_cache_number(ResRQ *rptr, char *numb)
 		 */
 		if (hashv == hash_number((u_char *)HE(cp)->h_addr_list[0]))
 			continue;
-#ifdef INET6
 		for (i = 1; HE(cp)->h_addr_list[i]; i++)
-#else
-		for (i = 1; HE(cp)->h_addr_list[i]; i++)
-#endif
 			if (!bcmp(HE(cp)->h_addr_list[i], numb,
 			    sizeof(struct IN_ADDR)))
 			{
@@ -1495,11 +1472,7 @@ static aCache *make_cache(ResRQ *rptr)
 #ifndef _WIN32
 	for (i = 0; WHOSTENTP(rptr->he.h_addr_list[i].S_ADDR); i++)
 		if ((cp = find_cache_number(rptr,
-#ifdef INET6
 		    (char *)(rptr->he.h_addr_list[i].S_ADDR))))
-#else
-		    (char *)&(rptr->he.h_addr_list[i].S_ADDR))))
-#endif
 		return cp;
 #else
 		for (i = 0; rptr->he->h_addr_list[i] &&
@@ -1758,13 +1731,7 @@ int m_dns(aClient *cptr, aClient *sptr, int parc, char *parv[])
 				sendto_one(sptr, "NOTICE %s : %s = %s (CN)",
 				    parv[0], HE(cp)->h_name,
 				    HE(cp)->h_aliases[i]);
-#ifdef INET6
-			for (i = 1; HE(cp)->h_addr_list[i]; i++)
-			{
-#else
-			for (i = 1; HE(cp)->h_addr_list[i]; i++)
-			{
-#endif
+			for (i = 1; HE(cp)->h_addr_list[i]; i++) {
 				sendto_one(sptr, "NOTICE %s : %s = %s (IP)",
 				    parv[0], HE(cp)->h_name,
 #ifdef INET6
@@ -1808,11 +1775,7 @@ u_long cres_mem(aClient *sptr, char *nick)
 #else
 		h = c->he;
 #endif
-#ifdef INET6
 		for (i = 0; h->h_addr_list[i]; i++)
-#else
-		for (i = 0; h->h_addr_list[i]; i++)
-#endif
 		{
 			im += sizeof(char *);
 			im += sizeof(struct IN_ADDR);