diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2188f28bd..dc6a79c17 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -39,11 +39,13 @@ Improved prompts
 Completions
 ^^^^^^^^^^^
 - Added completions for:
+  - ``apkanalyzer``
   - ``otool``
   - ``pre-commit`` (:issue:`9521`)
   - ``proxychains`` (:issue:`9486`)
   - ``mix phx``
   - ``neovim``
+  - ``scrypt``
   - ``stow``
   - ``trash`` and helper utilities ``trash-empty``, ``trash-list``, ``trash-put``, ``trash-restore``
 - Improvements to many completions.
diff --git a/share/completions/scrypt.fish b/share/completions/scrypt.fish
new file mode 100644
index 000000000..8006a24d0
--- /dev/null
+++ b/share/completions/scrypt.fish
@@ -0,0 +1,23 @@
+# Completions for the scrypt encryption utility
+
+complete -x -c scrypt -n __fish_use_subcommand -a enc -d "Encrypt file"
+complete -x -c scrypt -n __fish_use_subcommand -a dec -d "Decrypt file"
+complete -x -c scrypt -n __fish_use_subcommand -a info -d "Print information about the encryption parameters"
+
+complete -c scrypt -n "__fish_seen_subcommand_from enc dec" -s f -d "Force the operation to proceed"
+complete -x -c scrypt -n "__fish_seen_subcommand_from enc dec" -l logN -a "(seq 10 40)" -d "Set the work parameter N"
+complete -x -c scrypt -n "__fish_seen_subcommand_from enc dec" -s M -d "Use at most the specified bytes of RAM"
+complete -x -c scrypt -n "__fish_seen_subcommand_from enc dec" -s m -d "Use at most the specified fraction of the available RAM"
+complete -c scrypt -n "__fish_seen_subcommand_from enc dec" -s P -d "Deprecated synonym for `--passphrase dev:stdin-once`"
+complete -x -c scrypt -n "__fish_seen_subcommand_from enc dec" -s p -a "(seq 1 32)" -d "Set the work parameter p"
+complete -x -c scrypt -n "__fish_seen_subcommand_from enc dec" -l passphrase -a "
+    dev:tty-stdin\t'Read from /dev/tty, or stdin if fails (default)'
+    dev:stdin-once\t'Read from stdin'
+    dev:tty-once\t'Read from /dev/tty'
+    env:(set -xn)\t'Read from the environment variable'
+    file:(__fish_complete_path)\t'Read from the file'
+    " -d "Read the passphrase using the specified method"
+complete -x -c scrypt -n "__fish_seen_subcommand_from enc dec" -s r -a "(seq 1 32)" -d "Set the work parameter r"
+complete -x -c scrypt -n "__fish_seen_subcommand_from enc dec" -s t -d "Use at most the specified seconds of CPU time"
+complete -c scrypt -n "__fish_seen_subcommand_from enc dec" -s v -d "Print encryption parameters and memory/CPU limits"
+complete -x -c scrypt -n "not __fish_seen_subcommand_from enc dec info" -l version -d "Print version"