diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ae022955..70606c7f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -15,6 +15,8 @@ This project adheres to `Semantic Versioning <http://semver.org/>`_.
 * Added the ability to unset a request header with ``Header:``, and send an
   empty value with ``Header;``.
 * Added ``--default-scheme <URL_SCHEME>``.
+* Added fish shell completion (located in ``extras/httpie-completion.fish``
+  in the Github repo).
 * Changed the default JSON ``Accept`` header from ``application/json``
   to ``application/json, */*``.
 
diff --git a/httpie-completion.bash b/extras/httpie-completion.bash
similarity index 100%
rename from httpie-completion.bash
rename to extras/httpie-completion.bash
diff --git a/httpie-completion.fish b/extras/httpie-completion.fish
similarity index 100%
rename from httpie-completion.fish
rename to extras/httpie-completion.fish