3 files changed, 15 insertions, 8 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index f9f02a21e2..47198b1b91 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -61,6 +61,13 @@
 
       <list>
         <item>
+          <p>[httpc] Remove unnecessary usage of iolist_to_binary when 
+	  processing body (for PUT and POST). </p>
+	  <p>Filipe David Manana</p>
+	  <p>Own Id: OTP-9317</p>
+        </item>
+
+        <item>
           <p>[ftp] FTP client doesn't work with IPv6 host.</p>
 	  <p>Attila Rajmund Nohl</p>
           <p>Own Id: OTP-9342 Aux Id: seq11853</p>
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index 6ffa5e8ba5..8aaa9ec402 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -518,17 +518,15 @@ mk_chunkify_fun(ProcessBody) ->
 		eof ->
 		    {ok, <<"0\r\n\r\n">>, eof_body};
 		{ok, Data, NewAcc} ->
-		    {ok, mk_chunk_bin(Data), NewAcc}
+		    Chunk = [
+			     integer_to_list(iolist_size(Data), 16), 
+			     "\r\n",
+			     Data,
+			     "\r\n"],
+		    {ok, Chunk, NewAcc}
 	    end
     end.
 
-mk_chunk_bin(Data) ->
-    Bin = iolist_to_binary(Data),
-    iolist_to_binary([hex_size(Bin), "\r\n", Bin, "\r\n"]).
-
-hex_size(Bin) ->
-    hd(io_lib:format("~.16B", [size(Bin)])).
-
 
 handle_answer(RequestId, false, _) ->
     {ok, RequestId};
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 4aa53ae581..b64e266175 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -20,6 +20,7 @@
  [
   {"5.6", 
    [
+    {load_module, httpc, soft_purge, soft_purge, []}, 
     {load_module, http_transport, soft_purge, soft_purge, []}, 
     {update, ftp, soft, soft_purge, soft_purge, []}
    ]
@@ -48,6 +49,7 @@
  [
   {"5.6", 
    [
+    {load_module, httpc, soft_purge, soft_purge, []}, 
     {load_module, http_transport, soft_purge, soft_purge, []}, 
     {update, ftp, soft, soft_purge, soft_purge, []}
    ]