diff --git a/deps/rabbitmq_federation/.gitignore b/deps/rabbitmq_federation/.gitignore
index 096b057db8..59cb56159c 100644
--- a/deps/rabbitmq_federation/.gitignore
+++ b/deps/rabbitmq_federation/.gitignore
@@ -2,11 +2,12 @@
 .*.sw?
 *.beam
 .erlang.mk/
-cover/
-deps/
-doc/
-ebin/
-logs/
-plugins/
+/cover/
+/deps/
+/doc/
+/ebin/
+/logs/
+/plugins/
+/xrefr
 
 rabbitmq_federation.d
diff --git a/deps/rabbitmq_federation/src/rabbit_federation_upstream.erl b/deps/rabbitmq_federation/src/rabbit_federation_upstream.erl
index 656c190916..3e00500b0a 100644
--- a/deps/rabbitmq_federation/src/rabbit_federation_upstream.erl
+++ b/deps/rabbitmq_federation/src/rabbit_federation_upstream.erl
@@ -71,10 +71,7 @@ remove_credentials(URI) ->
     list_to_binary(amqp_uri:remove_credentials(binary_to_list(URI))).
 
 to_params(Upstream = #upstream{uris = URIs}, XorQ) ->
-    random:seed(erlang:phash2([node()]),
-                erlang:monotonic_time(),
-                erlang:unique_integer()),
-    URI = lists:nth(random:uniform(length(URIs)), URIs),
+    URI = lists:nth(rand_compat:uniform(length(URIs)), URIs),
     {ok, Params} = amqp_uri:parse(binary_to_list(URI), vhost(XorQ)),
     XorQ1 = with_name(Upstream, vhost(Params), XorQ),
     SafeURI = remove_credentials(URI),