diff --git a/CHANGELOG b/CHANGELOG
index a7e451d490..61babf75df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 git-annex (7.20200204) UNRELEASED; urgency=medium
 
   * Fix build with newest version of persistent-template.
+  * Makefile: Really move the fish completion to the
+    vendor_completions.d directory.
 
  -- Joey Hess <id@joeyh.name>  Tue, 04 Feb 2020 11:58:22 -0400
 
diff --git a/Makefile b/Makefile
index eb3a34e6a8..722921e002 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ install-completions: build
 		> $(DESTDIR)$(ZSH_COMPLETIONS_PATH)/_git-annex
 	install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/fish/vendor_completions.d
 	./git-annex --fish-completion-script git-annex 2>/dev/null \
-		> $(DESTDIR)$(PREFIX)/$(SHAREDIR)/fish/completions/git-annex.fish
+		> $(DESTDIR)$(PREFIX)/$(SHAREDIR)/fish/vendor_completions.d/git-annex.fish
 
 test: git-annex git-annex-shell
 	./git-annex test
diff --git a/doc/bugs/Incorrect_install_dir_for_fish_completion/comment_3_020854d8b66be6b17f850075fa8d95ac._comment b/doc/bugs/Incorrect_install_dir_for_fish_completion/comment_3_020854d8b66be6b17f850075fa8d95ac._comment
new file mode 100644
index 0000000000..3e18d4c192
--- /dev/null
+++ b/doc/bugs/Incorrect_install_dir_for_fish_completion/comment_3_020854d8b66be6b17f850075fa8d95ac._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2020-02-04T16:09:04Z"
+ content="""
+So it did. Fixed now. Thanks for checking.
+"""]]