1 files changed, 14 insertions, 5 deletions
diff --git a/lib/kernel/src/inet_db.erl b/lib/kernel/src/inet_db.erl
index 9cdffb5f2c..00c3a6af9c 100644
--- a/lib/kernel/src/inet_db.erl
+++ b/lib/kernel/src/inet_db.erl
@@ -1011,13 +1011,22 @@ handle_call(Request, From, #state{db=Db}=State) ->
 		      case inet_parse:resolv(
 			     Fname, {chars,Bin}) of
 			  {ok,Opts} ->
+			      Search =
+				  lists:foldl(
+				    fun ({search,L}, _) ->
+					    L;
+					({domain,""}, S) ->
+					    S;
+					({domain,D}, _) ->
+					    [D];
+					(_, S) ->
+					    S
+				    end, [], Opts),
 			      [del_ns,
 			       clear_search,
-			       clear_cache
-			       |[Opt ||
-				    {T,_}=Opt <- Opts,
-				    (T =:= nameserver orelse
-				     T =:= search)]];
+			       clear_cache,
+			       {search,Search}
+			       |[Opt || {nameserver,_}=Opt <- Opts]];
 			  _ -> error
 		      end
 	      end,