diff --git a/lib/dialyzer/plt/dialyzer_init_plt b/lib/dialyzer/plt/dialyzer_init_plt
index ef12265..224e343 100644
Binary files a/lib/dialyzer/plt/dialyzer_init_plt and b/lib/dialyzer/plt/dialyzer_init_plt differ
diff --git a/lib/edoc/priv/edoc_generate b/lib/edoc/priv/edoc_generate
diff --git a/lib/kernel/ebin/hipe_unified_loader.beam b/lib/kernel/ebin/hipe_unified_loader.beam
index 1c08a50..b555dc1 100644
Binary files a/lib/kernel/ebin/hipe_unified_loader.beam and b/lib/kernel/ebin/hipe_unified_loader.beam differ
diff --git a/lib/sasl/ebin/rb.beam b/lib/sasl/ebin/rb.beam
index 499b5d0..b56a632 100644
Binary files a/lib/sasl/ebin/rb.beam and b/lib/sasl/ebin/rb.beam differ
diff --git a/lib/sasl/src/rb.erl b/lib/sasl/src/rb.erl
index 5b10655..0342787 100644
--- a/lib/sasl/src/rb.erl
+++ b/lib/sasl/src/rb.erl
@@ -403,9 +403,9 @@ read_reports(Fd, Res, Type) ->
     end.
 
 read_report(Fd) ->
-    case io:get_chars(Fd,'',2) of
-        [Hi,Lo] ->
-            Size = get_int16(Hi,Lo),
+    case io:get_chars(Fd,'',4) of
+	[B1, B2, B3, B4] ->
+            <<Size:32/integer-big>> = list_to_binary([B1, B2, B3, B4]),
             case io:get_chars(Fd,'',Size) of
                 eof ->
                     {error,"Premature end of file"};
@@ -422,10 +422,6 @@ read_report(Fd) ->
         eof ->
             eof
     end.
- 
-get_int16(Hi,Lo) ->
-    ((Hi bsl 8) band 16#ff00) bor (Lo band 16#ff).
-
 
 %%-----------------------------------------------------------------
 %% Update these functions with the reports that should be possible
diff --git a/lib/snmp/mibs/Makefile b/lib/snmp/mibs/Makefile
diff --git a/lib/ssl/include/PKIX1Algorithms88.hrl b/lib/ssl/include/PKIX1Algorithms88.hrl
diff --git a/lib/ssl/include/PKIX1Explicit88.hrl b/lib/ssl/include/PKIX1Explicit88.hrl
diff --git a/lib/ssl/include/PKIX1Implicit88.hrl b/lib/ssl/include/PKIX1Implicit88.hrl
diff --git a/lib/ssl/include/PKIXAttributeCertificate.hrl b/lib/ssl/include/PKIXAttributeCertificate.hrl
diff --git a/lib/ssl/include/SSL-PKIX.hrl b/lib/ssl/include/SSL-PKIX.hrl
diff --git a/lib/stdlib/ebin/log_mf_h.beam b/lib/stdlib/ebin/log_mf_h.beam
index f88438c..0ff6a47 100644
Binary files a/lib/stdlib/ebin/log_mf_h.beam and b/lib/stdlib/ebin/log_mf_h.beam differ
diff --git a/lib/stdlib/src/log_mf_h.erl b/lib/stdlib/src/log_mf_h.erl
index 65b7cf4..afafee1 100644
--- a/lib/stdlib/src/log_mf_h.erl
+++ b/lib/stdlib/src/log_mf_h.erl
@@ -83,6 +83,7 @@ handle_event(Event, State) ->
 	true -> 
 	    Bin = term_to_binary(tag_event(Event)),
 	    Size = size(Bin),
+	    SizeTag = <<Size:32/integer-big>>,
 	    NewState =
 		if
 		    CurB + Size < MaxB -> State;
@@ -92,8 +93,7 @@ handle_event(Event, State) ->
 			{ok, NewFd} = file_open(Dir, NewF),
 			State#state{cur_fd = NewFd, curF = NewF, curB = 0}
 		end,
-	    [Hi,Lo] = put_int16(Size),
-	    file:write(NewState#state.cur_fd, [Hi, Lo, Bin]),
+	    file:write(NewState#state.cur_fd, [SizeTag, Bin]),
 	    {ok, NewState#state{curB = NewState#state.curB + Size + 2}};
 	_ ->
 	    {ok, State}
@@ -126,9 +126,6 @@ file_open(Dir, FileNo) ->
 	    exit({file, open})
     end.
 
-put_int16(I) ->
-    [((I band 16#ff00) bsr 8),I band 16#ff].
-
 tag_event(Event) ->    
     {erlang:localtime(), Event}.