diff --git a/Cargo.lock b/Cargo.lock
index a15a52b..0ddeb55 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -808,6 +808,7 @@ dependencies = [
  "log",
  "md5",
  "open",
+ "percent-encoding",
  "pretty_assertions",
  "pretty_env_logger 0.5.0",
  "rand",
@@ -1125,9 +1126,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pkg-config"
diff --git a/Cargo.toml b/Cargo.toml
index 9290f9e..8fa5188 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,6 +29,7 @@ libc = "0.2.0"
 log = "0.4.8"
 md5 = "0.7.0"
 open = "5.0.1"
+percent-encoding = "2.3.2"
 pretty_assertions = "1.4.0"
 pretty_env_logger = "0.5.0"
 rand = "0.8.5"
@@ -73,6 +74,7 @@ temptree = "0.2.0"
 [lints.clippy]
 all = { level = "deny", priority = -1 }
 float_cmp = "allow"
+format_collect = "allow"
 ignore_without_reason = "allow"
 large_enum_variant = "allow"
 needless_pass_by_value = "allow"
diff --git a/justfile b/justfile
index bb32fce..0bc9f42 100644
--- a/justfile
+++ b/justfile
@@ -29,6 +29,10 @@ done BRANCH=`git rev-parse --abbrev-ref HEAD`:
   git rebase github/master master
   git branch -d {{BRANCH}}
 
+ci: clippy forbid test
+  cargo fmt -- --check
+  cargo test --all -- --ignored
+
 test:
   cargo test --all
 
diff --git a/src/magnet_link.rs b/src/magnet_link.rs
index 7d09798..d2db6ea 100644
--- a/src/magnet_link.rs
+++ b/src/magnet_link.rs
@@ -1,12 +1,12 @@
-use {crate::common::*, url::form_urlencoded::byte_serialize as urlencode};
+use crate::common::*;
 
 #[derive(Clone, Debug, PartialEq)]
 pub(crate) struct MagnetLink {
+  pub(crate) indices: BTreeSet<u64>,
   pub(crate) infohash: Infohash,
   pub(crate) name: Option<String>,
   pub(crate) peers: Vec<HostPort>,
   pub(crate) trackers: Vec<Url>,
-  pub(crate) indices: BTreeSet<u64>,
 }
 
 impl MagnetLink {
@@ -33,7 +33,6 @@ impl MagnetLink {
     }
   }
 
-  #[allow(dead_code)]
   pub(crate) fn set_name(&mut self, name: impl Into<String>) {
     self.name = Some(name.into());
   }
@@ -55,31 +54,33 @@ impl MagnetLink {
 
     let mut query = format!("xt=urn:btih:{}", self.infohash);
 
+    let mut append = |key: &str, value: &str| {
+      query.push('&');
+      query.push_str(key);
+      query.push('=');
+      query.push_str(&Self::percent_encode_query_param(value));
+    };
+
     if let Some(name) = &self.name {
-      query.push_str("&dn=");
-      query.push_str(name);
+      append("dn", name);
     }
 
     for tracker in &self.trackers {
-      query.push_str("&tr=");
-      for part in urlencode(tracker.as_str().as_bytes()) {
-        query.push_str(part);
-      }
+      append("tr", tracker.as_str());
     }
 
     for peer in &self.peers {
-      query.push_str("&x.pe=");
-      query.push_str(&peer.to_string());
+      append("x.pe", &peer.to_string());
     }
 
     if !self.indices.is_empty() {
-      query.push_str("&so=");
-      for (i, selection_index) in self.indices.iter().enumerate() {
-        if i > 0 {
-          query.push(',');
-        }
-        query.push_str(&selection_index.to_string());
-      }
+      let indices = self
+        .indices
+        .iter()
+        .map(ToString::to_string)
+        .collect::<Vec<String>>()
+        .join(",");
+      append("so", &indices);
     }
 
     url.set_query(Some(&query));
@@ -146,6 +147,27 @@ impl MagnetLink {
 
     Ok(link)
   }
+
+  fn percent_encode_query_param(s: &str) -> String {
+    const ENCODE: &percent_encoding::AsciiSet = &percent_encoding::CONTROLS
+      .add(b' ')
+      .add(b'"')
+      .add(b'#')
+      .add(b'%')
+      .add(b'&')
+      .add(b'<')
+      .add(b'=')
+      .add(b'>')
+      .add(b'[')
+      .add(b'\\')
+      .add(b']')
+      .add(b'^')
+      .add(b'`')
+      .add(b'{')
+      .add(b'|')
+      .add(b'}');
+    percent_encoding::utf8_percent_encode(s, ENCODE).to_string()
+  }
 }
 
 impl FromStr for MagnetLink {
@@ -212,7 +234,7 @@ mod tests {
     link.add_tracker(Url::parse("http://foo.com/announce").unwrap());
     assert_eq!(
       link.to_url().as_str(),
-      "magnet:?xt=urn:btih:da39a3ee5e6b4b0d3255bfef95601890afd80709&tr=http%3A%2F%2Ffoo.com%2Fannounce"
+      "magnet:?xt=urn:btih:da39a3ee5e6b4b0d3255bfef95601890afd80709&tr=http://foo.com/announce"
     );
   }
 
@@ -242,8 +264,8 @@ mod tests {
       concat!(
         "magnet:?xt=urn:btih:da39a3ee5e6b4b0d3255bfef95601890afd80709",
         "&dn=foo",
-        "&tr=http%3A%2F%2Ffoo.com%2Fannounce",
-        "&tr=http%3A%2F%2Fbar.net%2Fannounce",
+        "&tr=http://foo.com/announce",
+        "&tr=http://bar.net/announce",
         "&x.pe=foo.com:1337",
         "&x.pe=bar.net:666",
       ),
@@ -270,8 +292,8 @@ mod tests {
     let magnet_str = concat!(
       "magnet:?xt=urn:btih:da39a3ee5e6b4b0d3255bfef95601890afd80709",
       "&dn=foo",
-      "&tr=http%3A%2F%2Ffoo.com%2Fannounce",
-      "&tr=http%3A%2F%2Fbar.net%2Fannounce"
+      "&tr=http://foo.com/announce",
+      "&tr=http://bar.net/announce"
     );
 
     let link_from = MagnetLink::from_str(magnet_str).unwrap();
@@ -284,7 +306,7 @@ mod tests {
     let magnet_str = concat!(
       "magnet:?xt=urn:btih:da39a3ee5e6b4b0d3255bfef95601890afd80709",
       "&dn=foo",
-      "&tr=http%3A%2F%2Ffoo.com%2Fannounce",
+      "&tr=http://foo.com/announce",
     );
 
     let link_from = MagnetLink::from_str(magnet_str).unwrap();
@@ -390,4 +412,74 @@ mod tests {
       } if text == link && addr == bad_addr
     );
   }
+
+  #[test]
+  fn magnet_link_query_params_are_percent_encoded() {
+    let mut e = "magnet:?xt=urn:btih:0000000000000000000000000000000000000000"
+      .parse::<MagnetLink>()
+      .unwrap();
+    e.set_name("foo bar");
+    e.add_tracker("http://[::]".parse().unwrap());
+    e.add_peer("[::]:0".parse().unwrap());
+
+    assert_eq!(
+      e.to_url().as_str(),
+      concat!(
+        "magnet:",
+        "?xt=urn:btih:0000000000000000000000000000000000000000",
+        "&dn=foo%20bar",
+        "&tr=http://%5B::%5D/",
+        "&x.pe=%5B::%5D:0",
+      ),
+    );
+  }
+
+  #[test]
+  fn percent_encode() {
+    // Build a string containing all safe characters to test against using the
+    // `query` grammar from the URL RFC:
+    //
+    // https://datatracker.ietf.org/doc/html/rfc3986#section-3.4
+    //
+    // `&` and `=` are omitted since they are used to delimit query parameter
+    // keys and values
+
+    // query = *( pchar / "/" / "?" )
+    let mut safe = "/?".to_string();
+
+    // pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
+    safe.push_str(":@");
+
+    // unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
+    for c in 'a'..='z' {
+      safe.push(c);
+    }
+
+    for c in 'A'..='Z' {
+      safe.push(c);
+    }
+
+    for c in '0'..='9' {
+      safe.push(c);
+    }
+
+    safe.push_str("-._~");
+
+    // sub-delims  = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
+    safe.push_str("!$'()*+,;");
+
+    for c in '\u{0}'..='\u{80}' {
+      let s = c.to_string();
+      if safe.contains(c) {
+        assert_eq!(MagnetLink::percent_encode_query_param(&s), s);
+      } else {
+        assert_eq!(
+          MagnetLink::percent_encode_query_param(&s),
+          s.bytes()
+            .map(|byte| format!("%{byte:02X}"))
+            .collect::<String>(),
+        );
+      }
+    }
+  }
 }
diff --git a/src/subcommand/torrent/create.rs b/src/subcommand/torrent/create.rs
index 97a2a00..fc4bd8f 100644
--- a/src/subcommand/torrent/create.rs
+++ b/src/subcommand/torrent/create.rs
@@ -2593,7 +2593,7 @@ Content Size  9 bytes
       "magnet:\
       ?xt=urn:btih:516735f4b80f2b5487eed5f226075bdcde33a54e\
       &dn=foo\
-      &tr=http%3A%2F%2Ffoo.com%2Fannounce\n"
+      &tr=http://foo.com/announce\n"
     );
   }
 
diff --git a/src/subcommand/torrent/link.rs b/src/subcommand/torrent/link.rs
index c89331b..1114fd8 100644
--- a/src/subcommand/torrent/link.rs
+++ b/src/subcommand/torrent/link.rs
@@ -233,7 +233,7 @@ mod tests {
     assert_eq!(
       env.out(),
       format!(
-        "magnet:?xt=urn:btih:{}&dn=foo&tr=https%3A%2F%2Ffoo.com%2Fannounce\n",
+        "magnet:?xt=urn:btih:{}&dn=foo&tr=https://foo.com/announce\n",
         infohash
       ),
     );
@@ -266,7 +266,7 @@ mod tests {
     assert_eq!(
       env.out(),
       format!(
-        "magnet:?xt=urn:btih:{}&dn=foo&tr=https%3A%2F%2Ffoo.com%2Fannounce&tr=https%3A%2F%2Fbar.com%2Fannounce\n",
+        "magnet:?xt=urn:btih:{}&dn=foo&tr=https://foo.com/announce&tr=https://bar.com/announce\n",
         infohash
       ),
     );
@@ -300,7 +300,7 @@ mod tests {
     assert_eq!(
       env.out(),
       format!(
-        "magnet:?xt=urn:btih:{}&dn=foo&tr=https%3A%2F%2Ffoo.com%2Fannounce&x.pe=foo.com:1337\n",
+        "magnet:?xt=urn:btih:{}&dn=foo&tr=https://foo.com/announce&x.pe=foo.com:1337\n",
         infohash
       ),
     );
@@ -336,7 +336,7 @@ mod tests {
     assert_eq!(
       env.out(),
       format!(
-        "magnet:?xt=urn:btih:{}&dn=foo&tr=https%3A%2F%2Ffoo.com%2Fannounce&so=2,4,6\n",
+        "magnet:?xt=urn:btih:{}&dn=foo&tr=https://foo.com/announce&so=2,4,6\n",
         infohash
       ),
     );