diff --git a/src/gen_server2.erl b/src/gen_server2.erl
index 2349439..f839aff 100644
--- a/src/gen_server2.erl
+++ b/src/gen_server2.erl
@@ -767,7 +767,7 @@ adjust_timeout_state(SleptAt, AwokeAt, {backoff, CurrentTO, MinimumTO,
             true -> lists:max([MinimumTO, CurrentTO div 2]);
             false -> CurrentTO
         end,
-    {Extra, RandomState1} = random:uniform_s(Base, RandomState),
+    {Extra, RandomState1} = rand:uniform_s(Base, RandomState),
     CurrentTO1 = Base + Extra,
     {backoff, CurrentTO1, MinimumTO, DesiredHibPeriod, RandomState1}.
 
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 26b7f87..13923d0 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -909,7 +909,7 @@ pget_or_die(K, P) ->
         V         -> V
     end.
 
-%% property merge 
+%% property merge
 pmerge(Key, Val, List) ->
       case proplists:is_defined(Key, List) of
               true -> List;
@@ -919,9 +919,9 @@ pmerge(Key, Val, List) ->
 %% proplists merge
 plmerge(P1, P2) ->
     dict:to_list(dict:merge(fun(_, V, _) ->
-                                V 
-                            end, 
-                            dict:from_list(P1), 
+                                V
+                            end,
+                            dict:from_list(P1),
                             dict:from_list(P2))).
 
 pset(Key, Value, List) -> [{Key, Value} | proplists:delete(Key, List)].
@@ -1166,12 +1166,12 @@ moving_average(Time,  HalfLife,  Next, Current) ->
 random(N) ->
     case get(random_seed) of
         undefined ->
-            random:seed(erlang:phash2([node()]),
+            rand:seed(exsplus, {erlang:phash2([node()]),
                         time_compat:monotonic_time(),
-                        time_compat:unique_integer());
+                        time_compat:unique_integer()});
         _ -> ok
     end,
-    random:uniform(N).
+    rand:uniform(N).
 
 %% Moved from rabbit/src/rabbit_cli.erl
 %% If the server we are talking to has non-standard net_ticktime, and