diff --git a/ChangeLog b/ChangeLog
index 62c70d4366..5a2e349a54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-08-17  Ulrich Drepper  <drepper@redhat.com>
 
+	* resolv/resolv.h (RES_DEFAULT): Add RES_NOIP6DOTINT.
+	* resolv/res_init.c (res_setoptions): Recognize ip6-dotint option.
+	Reset RES_NOIP6DOTINT flag in this case..
+
 	* sysdeps/posix/getaddrinfo.c: Fix memory handling of
 	ai_canonname.
 
diff --git a/resolv/res_init.c b/resolv/res_init.c
index e9392f46e5..3d3e5725e6 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -502,6 +502,9 @@ res_setoptions(res_state statp, const char *options, const char *source) {
 		} else if (!strncmp(cp, "no-ip6-dotint",
 				    sizeof("no-ip6-dotint") - 1)) {
 			statp->options |= RES_NOIP6DOTINT;
+		} else if (!strncmp(cp, "ip6-dotint",
+				    sizeof("ip6-dotint") - 1)) {
+			statp->options &= ~RES_NOIP6DOTINT;
 		} else if (!strncmp(cp, "rotate", sizeof("rotate") - 1)) {
 			statp->options |= RES_ROTATE;
 		} else if (!strncmp(cp, "no-check-names",
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 00eabe8694..1b2ea7f0fe 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -210,7 +210,7 @@ struct res_sym {
 #define RES_NOIP6DOTINT	0x00080000	/* Do not use .ip6.int in IPv6
 					   reverse lookup */
 
-#define RES_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
+#define RES_DEFAULT	(RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)
 
 /*
  * Resolver "pfcode" values.  Used by dig.