diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dafda9cb78..ca06beeb06 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -190,7 +190,7 @@ jobs:
         # uses: obi1kenobi/cargo-semver-checks-action@v2
         uses: n0-computer/cargo-semver-checks-action@feat-baseline
         with:
-          package: iroh, iroh-base, iroh-cli, iroh-dns-server, iroh-metrics, iroh-net, iroh-net-bench, iroh-router
+          package: iroh, iroh-base, iroh-cli, iroh-dns-server, iroh-metrics, iroh-net, iroh-net-bench, iroh-router, netwatch, portmapper
           baseline-rev: ${{ env.HEAD_COMMIT_SHA }}
           use-cache: false
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index aa52c43b06..7ebd2ab2ce 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -23,7 +23,7 @@ env:
   RUSTFLAGS: -Dwarnings
   RUSTDOCFLAGS: -Dwarnings
   SCCACHE_CACHE_SIZE: "50G"
-  CRATES_LIST: "iroh,iroh-metrics,iroh-net,iroh-net-bench,iroh-test,iroh-cli,iroh-dns-server,iroh-router"
+  CRATES_LIST: "iroh,iroh-metrics,iroh-net,iroh-net-bench,iroh-test,iroh-cli,iroh-dns-server,iroh-router,netwatch,portmapper"
   IROH_FORCE_STAGING_RELAYS: "1"
 
 jobs:
diff --git a/Cargo.lock b/Cargo.lock
index 318b8ce138..66342bd5e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2618,6 +2618,7 @@ dependencies = [
  "parking_lot",
  "pkarr",
  "portable-atomic",
+ "portmapper",
  "postcard",
  "quic-rpc",
  "rand",
@@ -2837,12 +2838,14 @@ dependencies = [
  "netlink-packet-core",
  "netlink-packet-route",
  "netlink-sys",
+ "netwatch",
  "ntest",
  "num_enum",
  "once_cell",
  "parking_lot",
  "pin-project",
  "pkarr",
+ "portmapper",
  "postcard",
  "pretty_assertions",
  "proptest",
@@ -2864,7 +2867,6 @@ dependencies = [
  "stun-rs",
  "surge-ping",
  "swarm-discovery",
- "testdir",
  "testresult",
  "thiserror",
  "time",
@@ -3365,6 +3367,35 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "netwatch"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "derive_more",
+ "futures-lite 2.3.0",
+ "futures-sink",
+ "futures-util",
+ "iroh-test",
+ "libc",
+ "netdev",
+ "netlink-packet-core",
+ "netlink-packet-route",
+ "netlink-sys",
+ "once_cell",
+ "rtnetlink",
+ "serde",
+ "socket2",
+ "thiserror",
+ "time",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+ "windows 0.51.1",
+ "wmi",
+]
+
 [[package]]
 name = "nibble_vec"
 version = "0.1.0"
@@ -3971,6 +4002,35 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
 
+[[package]]
+name = "portmapper"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "base64 0.22.1",
+ "bytes",
+ "derive_more",
+ "futures-lite 2.3.0",
+ "futures-util",
+ "igd-next",
+ "iroh-metrics",
+ "libc",
+ "netwatch",
+ "ntest",
+ "num_enum",
+ "rand",
+ "rand_chacha",
+ "serde",
+ "smallvec",
+ "socket2",
+ "thiserror",
+ "time",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "url",
+]
+
 [[package]]
 name = "positioned-io"
 version = "0.3.3"
diff --git a/Cargo.toml b/Cargo.toml
index 1cb098e60b..c069d76c1a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,8 @@ members = [
   "iroh-net/bench",
   "iroh-cli",
   "iroh-router",
+  "net-tools/netwatch",
+  "net-tools/portmapper",
 ]
 resolver = "2"