--- dnsmasq-1.18/config.h.dist	2004-03-01 22:25:12.000000000 -0600
+++ dnsmasq-1.18/config.h	2004-03-01 22:26:50.000000000 -0600
@@ -126,7 +126,9 @@
 
 /* Must preceed __linux__ since uClinux defines __linux__ too. */
 #if defined(__uClinux__) || defined(__UCLIBC__)
+#ifndef __UCLIBC_HAS_IPV6__
 #undef HAVE_LINUX_IPV6_PROC
+#endif
 #define HAVE_GETOPT_LONG
 #undef HAVE_ARC4RANDOM
 #define HAVE_RANDOM
diff -x CVS -urN dnsmasq-1.18/option.c dnsmasq.old/option.c
--- dnsmasq-1.18/option.c	2003-11-05 08:22:18.000000000 -0600
+++ dnsmasq.old/option.c	2004-01-05 23:40:11.000000000 -0600
@@ -578,8 +578,8 @@
 #ifdef HAVE_IPV6
 	    else if (tmp->source_addr.sa.sa_family == AF_INET6)
 	      tmp->source_addr.in6.sin6_port = htons(*query_port);
-	  }
 #endif  
+	  }
     }
   
   if (*if_addrs)