diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b8cb54d5..35bc2c04c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
   - `dhclient`
   - `tcpdump`
   - `tig`
+  - `zopfli`, and `zopflipng`
 
 ### Deprecations and removed features
 
diff --git a/share/completions/zopfli.fish b/share/completions/zopfli.fish
new file mode 100644
index 000000000..1b08d8a40
--- /dev/null
+++ b/share/completions/zopfli.fish
@@ -0,0 +1,8 @@
+complete -c zopfli -s h -d "Gives this help"
+complete -c zopfli -s c -d "Write the result on stdout"
+complete -c zopfli -s v -d "Verbose mode"
+complete -c zopfli -l i -d "Number of iterations"
+complete -c zopfli -l gzip -d "Output to gzip format (default)"
+complete -c zopfli -l zlib -d "Output to zlib format"
+complete -c zopfli -l deflate -d "Output to deflate format"
+complete -c zopfli -l splitlast -d "Left for backwards compatibility"
diff --git a/share/completions/zopflipng.fish b/share/completions/zopflipng.fish
new file mode 100644
index 000000000..837d3a5ba
--- /dev/null
+++ b/share/completions/zopflipng.fish
@@ -0,0 +1,15 @@
+complete -x -c zopflipng -a "(__fish_complete_suffix .png)"
+
+complete -c zopflipng -s m -d "Compress more"
+complete -c zopflipng -l prefix -d "Add prefix"
+complete -c zopflipng -s y -d "Do not ask about overwriting"
+complete -c zopflipng -l lossy_transparent -d "Remove colors behind alpha channel 0"
+complete -c zopflipng -l lossy_8bit -d "Convert PNG16 to PNG8"
+complete -c zopflipng -s d -d "Dry run"
+complete -c zopflipng -l always_zopflify -d "For benchmarking the algorithm"
+complete -c zopflipng -s q -d "Use quick"
+complete -c zopflipng -l iterations -d "Number of iterations"
+complete -c zopflipng -l splitting -d "Left for backwards compatibility"
+complete -x -c zopflipng -l filters -a "0 1 2 3 4 m e p b" -d "Filter strategies"
+complete -c zopflipng -l keepchunks -d "Keep metadata chunks"
+complete -c zopflipng -s h -l help -d "Show help"