diff --git a/.gitignore b/.gitignore
index 80891986e..00a5bb5a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /bin
+/share/man/man1
 /gh-cli
 .envrc
 /dist
@@ -16,5 +17,3 @@
 .DS_Store
 
 vendor/
-
-manpage
diff --git a/.goreleaser.yml b/.goreleaser.yml
index be3dc2274..0996d24d5 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -36,7 +36,7 @@ archives:
       darwin: macOS
     format: tar.gz
     files:
-      - manpage/gh*.1
+      - ./share/man/man1/gh*.1
   - id: windows
     builds: [windows]
     <<: *archive_defaults
@@ -61,7 +61,7 @@ brews:
     install: |
       system "make" if build.head?
       bin.install "bin/gh"
-      man1.install Dir["manpages/*.1"]
+      man1.install Dir["./share/man/man1/gh*.1"]
       (bash_completion/"gh.sh").write `#{bin}/gh completion -s bash`
       (zsh_completion/"_gh").write `#{bin}/gh completion -s zsh`
       (fish_completion/"gh.fish").write `#{bin}/gh completion -s fish`
@@ -80,7 +80,7 @@ nfpms:
       - deb
       - rpm
     files:
-      "./manpage/gh*.1": "/usr/share/man/man1"
+      "./share/man/man1/gh*.1": "/usr/share/man/man1"
 
 scoop:
   bucket:
diff --git a/Makefile b/Makefile
index 87ec9d8d5..bcf564947 100644
--- a/Makefile
+++ b/Makefile
@@ -46,9 +46,9 @@ endif
 .PHONY: site-publish
 
 
-manpage:
+share/man/man1/:
 	mkdir -p $@
 
 .PHONY: manpages
 manpages: manpage
-	go run ./cmd/gen-docs --man-page --doc-path ./manpage
+	go run ./cmd/gen-docs --man-page --doc-path ./share/man/man1/