5 files changed, 8 insertions, 4 deletions
diff --git a/misc/bash_completion/git-bug b/misc/completion/bash/git-bug
index 85d2a15b..92b90d3c 100644
--- a/misc/bash_completion/git-bug
+++ b/misc/completion/bash/git-bug
@@ -287,6 +287,8 @@ fi
 
 # ex: ts=4 sw=4 et filetype=sh
 
+# Custom bash code to connect the git completion for "git bug" to the
+# git-bug completion for "git-bug"
 _git_bug() {
     local cur prev words cword split
 
diff --git a/misc/fish_completion/git-bug b/misc/completion/fish/git-bug
index a3c2d008..a3c2d008 100644
--- a/misc/fish_completion/git-bug
+++ b/misc/completion/fish/git-bug
diff --git a/misc/gen_completion.go b/misc/completion/gen_completion.go
index 1f86124d..5f643832 100644
--- a/misc/gen_completion.go
+++ b/misc/completion/gen_completion.go
@@ -44,13 +44,15 @@ func genBash(root *cobra.Command) error {
 	if err != nil {
 		return err
 	}
-	f, err := os.Create(filepath.Join(cwd, "misc", "bash_completion", "git-bug"))
+	f, err := os.Create(filepath.Join(cwd, "misc", "completion", "bash", "git-bug"))
 	if err != nil {
 		return err
 	}
 	defer f.Close()
 
 	const patch = `
+# Custom bash code to connect the git completion for "git bug" to the
+# git-bug completion for "git-bug"
 _git_bug() {
     local cur prev words cword split
 
@@ -102,7 +104,7 @@ func genFish(root *cobra.Command) error {
 	if err != nil {
 		return err
 	}
-	dir := filepath.Join(cwd, "misc", "fish_completion", "git-bug")
+	dir := filepath.Join(cwd, "misc", "completion", "fish", "git-bug")
 	return root.GenFishCompletionFile(dir, true)
 }
 
@@ -111,7 +113,7 @@ func genPowerShell(root *cobra.Command) error {
 	if err != nil {
 		return err
 	}
-	path := filepath.Join(cwd, "misc", "powershell_completion", "git-bug")
+	path := filepath.Join(cwd, "misc", "completion", "powershell", "git-bug")
 	return root.GenPowerShellCompletionFile(path)
 }
 
@@ -120,6 +122,6 @@ func genZsh(root *cobra.Command) error {
 	if err != nil {
 		return err
 	}
-	path := filepath.Join(cwd, "misc", "zsh_completion", "git-bug")
+	path := filepath.Join(cwd, "misc", "completion", "zsh", "git-bug")
 	return root.GenZshCompletionFile(path)
 }
diff --git a/misc/powershell_completion/git-bug b/misc/completion/powershell/git-bug
index b8280eea..b8280eea 100644
--- a/misc/powershell_completion/git-bug
+++ b/misc/completion/powershell/git-bug
diff --git a/misc/zsh_completion/git-bug b/misc/completion/zsh/git-bug
index e7cbe9a9..e7cbe9a9 100644
--- a/misc/zsh_completion/git-bug
+++ b/misc/completion/zsh/git-bug