diff --git a/ChangeLog b/ChangeLog
index d72fe558b..426a8bd3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-01  Badlop  <badlop@process-one.net>
+
+	* src/web/ejabberd_http.erl: Temporary solution for check of
+	packet size when HTTPS (EJAB-611)(EJAB-507)(EJAB-574)
+
 2008-07-31  Badlop  <badlop@process-one.net>
 
 	* doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708)
diff --git a/src/web/ejabberd_http.erl b/src/web/ejabberd_http.erl
index d77770607..514cf730e 100644
--- a/src/web/ejabberd_http.erl
+++ b/src/web/ejabberd_http.erl
@@ -390,7 +390,10 @@ recv_data(_State, 0, Acc) ->
 recv_data(State, Len, Acc) ->
     case State#state.trail of
 	[] ->
-	    case (State#state.sockmod):recv(State#state.socket, Len, 300000) of
+	    %% TODO: Fix the problem in tls C driver and revert this workaround
+	    %% https://support.process-one.net/browse/EJAB-611
+	    %%case (State#state.sockmod):recv(State#state.socket, Len, 300000) of
+	    case (State#state.sockmod):recv(State#state.socket,   0, 300000) of
 		{ok, Data} ->
 		    recv_data(State, Len - size(Data), [Acc | Data]);
 		_ ->