diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6db34d..622adcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Changed
 - code cleanup
+- switch over to tokio-ping fork, tokio-icmp-echo
 
 ## [v0.4.0] - 2021-04-23
 ### Changed
diff --git a/Cargo.lock b/Cargo.lock
index 0c3cad7..6dba44c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -462,7 +462,7 @@ dependencies = [
  "prometheus",
  "serde",
  "tokio",
- "tokio-ping",
+ "tokio-icmp-echo",
  "toml",
 ]
 
@@ -726,20 +726,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-macros"
-version = "1.1.0"
+name = "tokio-icmp-echo"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-ping"
-version = "0.3.0"
-source = "git+https://github.com/jcgruenhage/tokio-ping?branch=main#cf9b2de4ceb838b6ac82a28a3c87eaf4a32b8a5a"
+checksum = "6a22ee530dd5521192842786230ab5fdd7a330d7d865c81087a06fef2ac6ab22"
 dependencies = [
  "futures",
  "libc",
@@ -751,6 +741,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-macros"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.6.6"
diff --git a/Cargo.toml b/Cargo.toml
index 3f4f08c..30c8eb9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ fern = "0.6.0"
 log = "0.4.14"
 chrono = "0.4.19"
 serde = { version = "1.0.125", features = ["derive"] }
-tokio-ping = { git = "https://github.com/jcgruenhage/tokio-ping", branch = "main" }
+tokio-icmp-echo = "0.4"
 futures-util = "0.3.14"
 anyhow = "1.0.40"
 async-anyhow-logger = "0.1.0"
diff --git a/src/ping.rs b/src/ping.rs
index e457b69..e4894d8 100644
--- a/src/ping.rs
+++ b/src/ping.rs
@@ -25,7 +25,7 @@ use log::{info, trace};
 use prometheus::*;
 use std::net::IpAddr;
 use std::time::Duration;
-use tokio_ping::{PingFuture, Pinger};
+use tokio_icmp_echo::{PingFuture, Pinger};
 
 lazy_static! {
     static ref PING_HISTOGRAM: HistogramVec = register_histogram_vec!(