diff --git a/ping/Cargo.toml b/ping/Cargo.toml
index 4e173a30..0417100d 100644
--- a/ping/Cargo.toml
+++ b/ping/Cargo.toml
@@ -11,7 +11,7 @@ multiaddr = { path = "../multiaddr" }
 multistream-select = { path = "../multistream-select" }
 futures = "0.1"
 parking_lot = "0.5"
-rand = "0.3"
+rand = "0.5"
 tokio-codec = "0.1"
 tokio-io = "0.1"
 
diff --git a/ping/src/lib.rs b/ping/src/lib.rs
index 067999d2..2f06f395 100644
--- a/ping/src/lib.rs
+++ b/ping/src/lib.rs
@@ -93,8 +93,7 @@ use futures::sync::{mpsc, oneshot};
 use futures::{Future, Sink, Stream};
 use libp2p_core::{ConnectionUpgrade, Endpoint};
 use parking_lot::Mutex;
-use rand::os::OsRng;
-use rand::Rand;
+use rand::{prelude::*, rngs::EntropyRng, distributions::Standard};
 use std::collections::HashMap;
 use std::error::Error;
 use std::io::Error as IoError;
@@ -145,14 +144,9 @@ where
         // never produce anything.
         let rx = rx.then(|r| Ok(r.ok())).filter_map(|a| a);
 
-        let os_rng = match OsRng::new() {
-            Ok(r) => r,
-            Err(err) => return Err(err).into_future(),
-        };
-
         let pinger = Pinger {
             send: tx,
-            os_rng: os_rng,
+            rng: EntropyRng::default(),
         };
 
         // Hashmap that associates outgoing payloads to one-shot senders.
@@ -219,7 +213,7 @@ where
 /// Controller for the ping service. Makes it possible to send pings to the remote.
 pub struct Pinger {
     send: mpsc::Sender<Message>,
-    os_rng: OsRng,
+    rng: EntropyRng,
 }
 
 impl Pinger {
@@ -229,7 +223,8 @@ impl Pinger {
     ///           timeout yourself when you call this function.
     pub fn ping(&mut self) -> Box<Future<Item = (), Error = Box<Error + Send + Sync>>> {
         let (tx, rx) = oneshot::channel();
-        let payload: [u8; 32] = Rand::rand(&mut self.os_rng);
+
+        let payload: [u8; 32] = self.rng.sample(Standard);
         debug!("Preparing for ping with payload {:?}", payload);
         // Ignore errors if the ponger has been already destroyed. The returned future will never
         // be signalled.
@@ -242,6 +237,15 @@ impl Pinger {
     }
 }
 
+impl Clone for Pinger {
+    fn clone(&self) -> Pinger {
+        Pinger {
+            send: self.send.clone(),
+            rng: EntropyRng::default(),
+        }
+    }
+}
+
 enum Message {
     Ping(Bytes, oneshot::Sender<()>),
     Received(Bytes),