35 files changed, 3 insertions, 5 deletions
diff --git a/HACKING.txt b/HACKING.txt
index 6c142e13f..9f45903a7 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -81,7 +81,6 @@ libc/
   private/
     # These are private header files meant for use within bionic itself.
 
-  netbsd/
   stdio/
   stdlib/
   unistd/
@@ -89,9 +88,8 @@ libc/
     # mess of random versions of random files from all three of FreeBSD, NetBSD,
     # and OpenBSD! We've been working to clean that up, but these directories
     # are basically where all the stuff we haven't got to yet lives.
-    # The 'netbsd' directory misleadingly contains the DNS resolver (which will
-    # probably be forked sometime soon, and that directory simply renamed).
-    # The other directories contain stuff that still needs to be sorted.
+  dns/
+    # Contains the DNS resolver (originates from NetBSD code).
 
   upstream-dlmalloc/
   upstream-freebsd/
diff --git a/libc/Android.mk b/libc/Android.mk
index 852db739c..f3a2ce8b8 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -509,7 +509,7 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-c-files-under,netbsd)
+LOCAL_SRC_FILES := $(call all-c-files-under,dns)
 LOCAL_CFLAGS := \
     $(libc_common_cflags) \
     -DINET6 \
diff --git a/libc/netbsd/gethnamaddr.c b/libc/dns/gethnamaddr.c
index 5b2f98750..5b2f98750 100644
--- a/libc/netbsd/gethnamaddr.c
+++ b/libc/dns/gethnamaddr.c
diff --git a/libc/netbsd/inet/nsap_addr.c b/libc/dns/inet/nsap_addr.c
index e18bd33fe..e18bd33fe 100644
--- a/libc/netbsd/inet/nsap_addr.c
+++ b/libc/dns/inet/nsap_addr.c
diff --git a/libc/netbsd/nameser/ns_name.c b/libc/dns/nameser/ns_name.c
index 85d2f6053..85d2f6053 100644
--- a/libc/netbsd/nameser/ns_name.c
+++ b/libc/dns/nameser/ns_name.c
diff --git a/libc/netbsd/nameser/ns_netint.c b/libc/dns/nameser/ns_netint.c
index 1b2964f4a..1b2964f4a 100644
--- a/libc/netbsd/nameser/ns_netint.c
+++ b/libc/dns/nameser/ns_netint.c
diff --git a/libc/netbsd/nameser/ns_parse.c b/libc/dns/nameser/ns_parse.c
index fd94860c9..fd94860c9 100644
--- a/libc/netbsd/nameser/ns_parse.c
+++ b/libc/dns/nameser/ns_parse.c
diff --git a/libc/netbsd/nameser/ns_print.c b/libc/dns/nameser/ns_print.c
index 7465e6203..7465e6203 100644
--- a/libc/netbsd/nameser/ns_print.c
+++ b/libc/dns/nameser/ns_print.c
diff --git a/libc/netbsd/nameser/ns_samedomain.c b/libc/dns/nameser/ns_samedomain.c
index 04fdb6186..04fdb6186 100644
--- a/libc/netbsd/nameser/ns_samedomain.c
+++ b/libc/dns/nameser/ns_samedomain.c
diff --git a/libc/netbsd/nameser/ns_ttl.c b/libc/dns/nameser/ns_ttl.c
index cc98331f8..cc98331f8 100644
--- a/libc/netbsd/nameser/ns_ttl.c
+++ b/libc/dns/nameser/ns_ttl.c
diff --git a/libc/netbsd/net/base64.c b/libc/dns/net/base64.c
index 72707035f..72707035f 100644
--- a/libc/netbsd/net/base64.c
+++ b/libc/dns/net/base64.c
diff --git a/libc/netbsd/net/getaddrinfo.c b/libc/dns/net/getaddrinfo.c
index 937c42350..937c42350 100644
--- a/libc/netbsd/net/getaddrinfo.c
+++ b/libc/dns/net/getaddrinfo.c
diff --git a/libc/netbsd/net/getnameinfo.c b/libc/dns/net/getnameinfo.c
index d6c448864..d6c448864 100644
--- a/libc/netbsd/net/getnameinfo.c
+++ b/libc/dns/net/getnameinfo.c
diff --git a/libc/netbsd/net/getservbyname.c b/libc/dns/net/getservbyname.c
index 5ea528e29..5ea528e29 100644
--- a/libc/netbsd/net/getservbyname.c
+++ b/libc/dns/net/getservbyname.c
diff --git a/libc/netbsd/net/getservbyport.c b/libc/dns/net/getservbyport.c
index fad7e236a..fad7e236a 100644
--- a/libc/netbsd/net/getservbyport.c
+++ b/libc/dns/net/getservbyport.c
diff --git a/libc/netbsd/net/getservent.c b/libc/dns/net/getservent.c
index 9f6ec32f9..9f6ec32f9 100644
--- a/libc/netbsd/net/getservent.c
+++ b/libc/dns/net/getservent.c
diff --git a/libc/netbsd/net/nsdispatch.c b/libc/dns/net/nsdispatch.c
index 15282bed8..15282bed8 100644
--- a/libc/netbsd/net/nsdispatch.c
+++ b/libc/dns/net/nsdispatch.c
diff --git a/libc/netbsd/net/reentrant.h b/libc/dns/net/reentrant.h
index 60bff089e..60bff089e 100644
--- a/libc/netbsd/net/reentrant.h
+++ b/libc/dns/net/reentrant.h
diff --git a/libc/netbsd/net/servent.h b/libc/dns/net/servent.h
index 822b37504..822b37504 100644
--- a/libc/netbsd/net/servent.h
+++ b/libc/dns/net/servent.h
diff --git a/libc/netbsd/net/services.h b/libc/dns/net/services.h
index fa199d084..fa199d084 100644
--- a/libc/netbsd/net/services.h
+++ b/libc/dns/net/services.h
diff --git a/libc/netbsd/resolv/__dn_comp.c b/libc/dns/resolv/__dn_comp.c
index 93d3f1988..93d3f1988 100644
--- a/libc/netbsd/resolv/__dn_comp.c
+++ b/libc/dns/resolv/__dn_comp.c
diff --git a/libc/netbsd/resolv/__res_close.c b/libc/dns/resolv/__res_close.c
index 3af50b06b..3af50b06b 100644
--- a/libc/netbsd/resolv/__res_close.c
+++ b/libc/dns/resolv/__res_close.c
diff --git a/libc/netbsd/resolv/__res_send.c b/libc/dns/resolv/__res_send.c
index 198b05c12..198b05c12 100644
--- a/libc/netbsd/resolv/__res_send.c
+++ b/libc/dns/resolv/__res_send.c
diff --git a/libc/netbsd/resolv/herror.c b/libc/dns/resolv/herror.c
index e90e64141..e90e64141 100644
--- a/libc/netbsd/resolv/herror.c
+++ b/libc/dns/resolv/herror.c
diff --git a/libc/netbsd/resolv/res_cache.c b/libc/dns/resolv/res_cache.c
index 5e2bb5cea..5e2bb5cea 100644
--- a/libc/netbsd/resolv/res_cache.c
+++ b/libc/dns/resolv/res_cache.c
diff --git a/libc/netbsd/resolv/res_comp.c b/libc/dns/resolv/res_comp.c
index 77b81b4ae..77b81b4ae 100644
--- a/libc/netbsd/resolv/res_comp.c
+++ b/libc/dns/resolv/res_comp.c
diff --git a/libc/netbsd/resolv/res_data.c b/libc/dns/resolv/res_data.c
index 7e5a30849..7e5a30849 100644
--- a/libc/netbsd/resolv/res_data.c
+++ b/libc/dns/resolv/res_data.c
diff --git a/libc/netbsd/resolv/res_debug.c b/libc/dns/resolv/res_debug.c
index 46e583b75..46e583b75 100644
--- a/libc/netbsd/resolv/res_debug.c
+++ b/libc/dns/resolv/res_debug.c
diff --git a/libc/netbsd/resolv/res_debug.h b/libc/dns/resolv/res_debug.h
index 4341c5a1e..4341c5a1e 100644
--- a/libc/netbsd/resolv/res_debug.h
+++ b/libc/dns/resolv/res_debug.h
diff --git a/libc/netbsd/resolv/res_init.c b/libc/dns/resolv/res_init.c
index ceb412b85..ceb412b85 100644
--- a/libc/netbsd/resolv/res_init.c
+++ b/libc/dns/resolv/res_init.c
diff --git a/libc/netbsd/resolv/res_mkquery.c b/libc/dns/resolv/res_mkquery.c
index fb4de7f7d..fb4de7f7d 100644
--- a/libc/netbsd/resolv/res_mkquery.c
+++ b/libc/dns/resolv/res_mkquery.c
diff --git a/libc/netbsd/resolv/res_private.h b/libc/dns/resolv/res_private.h
index 834191309..834191309 100644
--- a/libc/netbsd/resolv/res_private.h
+++ b/libc/dns/resolv/res_private.h
diff --git a/libc/netbsd/resolv/res_query.c b/libc/dns/resolv/res_query.c
index d31e83c4a..d31e83c4a 100644
--- a/libc/netbsd/resolv/res_query.c
+++ b/libc/dns/resolv/res_query.c
diff --git a/libc/netbsd/resolv/res_send.c b/libc/dns/resolv/res_send.c
index e587bdc81..e587bdc81 100644
--- a/libc/netbsd/resolv/res_send.c
+++ b/libc/dns/resolv/res_send.c
diff --git a/libc/netbsd/resolv/res_state.c b/libc/dns/resolv/res_state.c
index f5d01a1f4..f5d01a1f4 100644
--- a/libc/netbsd/resolv/res_state.c
+++ b/libc/dns/resolv/res_state.c