diff --git a/ChangeLog b/ChangeLog
index 1204575be1..6ba3b8e840 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-06  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* resolv/res_init.c (__res_iclose): Only clear nsinit if the
+	addresses have been freed.
+
 2015-01-06  Aurelien Jarno  <aurelien@aurel32.net>
 
 	* resolv/res_init.c (__res_vinit): Improve comments about nserv
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 4c170be684..553ba12a5a 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -621,7 +621,8 @@ __res_iclose(res_state statp, bool free_addr) {
 				statp->_u._ext.nsaddrs[ns] = NULL;
 			}
 		}
-	statp->_u._ext.nsinit = 0;
+	if (free_addr)
+		statp->_u._ext.nsinit = 0;
 }
 libc_hidden_def (__res_iclose)