diff --git a/MANIFEST.in b/MANIFEST.in
index a09a3037eb..bf07fbb08e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,3 +6,7 @@ include docs/README.md
 
 # <https://github.com/httpie/cli/issues/182>
 recursive-include tests/ *
+
+# Shell completions installed through setup.cfg data_files
+include extras/httpie-completion.fish
+include extras/fish/http.fish
diff --git a/extras/fish/http.fish b/extras/fish/http.fish
new file mode 100644
index 0000000000..5a7b242cbc
--- /dev/null
+++ b/extras/fish/http.fish
@@ -0,0 +1,2 @@
+# Fish loads completions by command name; keep the canonical definitions in one file.
+source (dirname (status --current-filename))/httpie-completion.fish
diff --git a/setup.cfg b/setup.cfg
index 85490981aa..bb0d5bbd6a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -108,3 +108,6 @@ share/man/man1 =
     extras/man/http.1
     extras/man/https.1
     extras/man/httpie.1
+share/fish/vendor_completions.d =
+    extras/httpie-completion.fish
+    extras/fish/http.fish