diff --git a/cleanup-package-files/Cargo.lock b/cleanup-package-files/Cargo.lock
index a76c9d7..ae14229 100644
--- a/cleanup-package-files/Cargo.lock
+++ b/cleanup-package-files/Cargo.lock
@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -20,12 +26,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "bitflags"
 version = "2.6.0"
@@ -57,24 +57,51 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "clap"
-version = "2.34.0"
+version = "4.5.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
+dependencies = [
+ "anstyle",
+ "clap_lex",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
- "bitflags 1.3.2",
- "textwrap",
- "unicode-width",
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
+[[package]]
+name = "clap_lex"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+
 [[package]]
 name = "cleanup-package-files"
 version = "0.1.0"
 dependencies = [
+ "clap",
  "expanduser",
  "eyre",
  "nix",
  "pwd",
- "structopt",
 ]
 
 [[package]]
@@ -134,12 +161,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indenter"
@@ -155,9 +179,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.167"
+version = "0.2.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "nix"
@@ -165,7 +189,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -177,30 +201,6 @@ version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.92"
@@ -258,41 +258,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "structopt"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
-dependencies = [
- "clap",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.90"
@@ -304,15 +269,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -330,7 +286,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn",
 ]
 
 [[package]]
@@ -339,24 +295,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
 [[package]]
 name = "wasi"
 version = "0.9.0+wasi-snapshot-preview1"
diff --git a/cleanup-package-files/Cargo.toml b/cleanup-package-files/Cargo.toml
index af960b7..2839d74 100644
--- a/cleanup-package-files/Cargo.toml
+++ b/cleanup-package-files/Cargo.toml
@@ -8,13 +8,9 @@ edition = "2021"
 eyre = "*"
 expanduser = "*"
 # since 1.4.0 it uses thiserror instead of failure
-pwd = "1.4"
+pwd = "*"
 nix = { version = "*", features = ["fs", "user"] }
-
-[dependencies.structopt]
-version = "*"
-default-features = false
-features = []
+clap = { version = "*", default-features = false, features = ["std", "derive", "help", "usage", "error-context"] }
 
 [profile.release]
 lto = true
diff --git a/cleanup-package-files/src/main.rs b/cleanup-package-files/src/main.rs
index f5025e6..01a614a 100644
--- a/cleanup-package-files/src/main.rs
+++ b/cleanup-package-files/src/main.rs
@@ -6,7 +6,7 @@ use std::fs::File;
 
 use expanduser::expanduser;
 use eyre::{Result, ensure, eyre};
-use structopt::StructOpt;
+use clap::Parser;
 use nix::fcntl::Flock;
 
 const LILAC_LOCK: &str = "~lilydjwg/.lilac/.lock";
@@ -35,17 +35,16 @@ fn git_ls_files() -> Result<Vec<OsString>> {
   )
 }
 
-#[derive(StructOpt, Debug)]
-#[structopt(name = "basic")]
-struct Opt {
+#[derive(Parser, Debug)]
+struct Cli {
   /// remove files for real; or only print what will be removed
-  #[structopt(long="real")]
+  #[arg(long="real")]
   real: bool,
   pkgname: String,
 }
 
 fn main() -> Result<()> {
-  let opt = Opt::from_args();
+  let cli = Cli::parse();
 
   let pwd = pwd::Passwd::from_name(USER)
     .map_err(|e| eyre!("cannot get passwd entry for user {}: {:?}", USER, e))?
@@ -53,11 +52,11 @@ fn main() -> Result<()> {
   nix::unistd::setuid(nix::unistd::Uid::from_raw(pwd.uid))?;
 
   let _lock;
-  if opt.real {
+  if cli.real {
     _lock = flock(expanduser(LILAC_LOCK)?)?;
   }
   let mut path = expanduser(LILAC_REPO)?;
-  path.push(&opt.pkgname);
+  path.push(&cli.pkgname);
 
   std::env::set_current_dir(&path)?;
   let tracked_files = git_ls_files()?;
@@ -68,7 +67,7 @@ fn main() -> Result<()> {
     if tracked_files.contains(&file_name) {
       continue;
     }
-    if opt.real {
+    if cli.real {
       println!("rm -rf {}", entry.path().display());
       Command::new("rm").arg("-rf").arg(&file_name).spawn()?;
     } else {