diff --git a/.gitignore b/.gitignore
index 5eaba4199511d12a3a1628965aeb5425453c72f9..aef01c5a2b62c7d2c15b7890925530c132425119 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ git-archive
 git-bisect
 git-blame
 git-branch
-git-browse-help
+git-browse--help
 git-bundle
 git-cat-file
 git-check-attr
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 31ec403a705456b0fcc41eb7196484e0919eccae..8cd69e7129f431185a1d78953cde5d955675372d 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -47,13 +47,13 @@ OPTIONS
 +
 The web browser can be specified using the configuration variable
 'help.browser', or 'web.browser' if the former is not set. If none of
-these config variables is set, the 'git-browse-help' script (called by
-'git-help') will pick a suitable default.
+these config variables is set, the 'git-browse--help' helper script
+(called by 'git-help') will pick a suitable default.
 +
 You can explicitly provide a full path to your prefered browser by
 setting the configuration variable 'browser.<tool>.path'. For example,
 you can configure the absolute path to firefox by setting
-'browser.firefox.path'. Otherwise, 'git-browse-help' assumes the tool
+'browser.firefox.path'. Otherwise, 'git-browse--help' assumes the tool
 is available in PATH.
 +
 Note that the script tries, as much as possible, to display the HTML
diff --git a/Makefile b/Makefile
index 16de2f3e252ad2b3324c0c439ad6e771e4ca358c..43d6197495f6cde1be725388902e557884b81917 100644
--- a/Makefile
+++ b/Makefile
@@ -227,7 +227,7 @@ SCRIPT_SH = \
 	git-lost-found.sh git-quiltimport.sh git-submodule.sh \
 	git-filter-branch.sh \
 	git-stash.sh \
-	git-browse-help.sh
+	git-browse--help.sh
 
 SCRIPT_PERL = \
 	git-add--interactive.perl \
@@ -1144,9 +1144,8 @@ check-docs::
 		case "$$v" in \
 		git-merge-octopus | git-merge-ours | git-merge-recursive | \
 		git-merge-resolve | git-merge-stupid | git-merge-subtree | \
-		git-add--interactive | git-fsck-objects | git-init-db | \
-		git-rebase--interactive | \
-		git-repo-config | git-fetch--tool ) continue ;; \
+		git-fsck-objects | git-init-db | git-repo-config | \
+		git-?*--?* ) continue ;; \
 		esac ; \
 		test -f "Documentation/$$v.txt" || \
 		echo "no doc: $$v"; \
diff --git a/git-browse-help.sh b/git-browse--help.sh
similarity index 100%
rename from git-browse-help.sh
rename to git-browse--help.sh
diff --git a/help.c b/help.c
index 551b5b93b37f49e53746cb628416ab34d1dd9bd5..f9ce6db34f43874442223468dbc536a7369ae1c5 100644
--- a/help.c
+++ b/help.c
@@ -331,7 +331,7 @@ static void show_info_page(const char *git_cmd)
 static void show_html_page(const char *git_cmd)
 {
 	const char *page = cmd_to_page(git_cmd);
-	execl_git_cmd("browse-help", page, NULL);
+	execl_git_cmd("browse--help", page, NULL);
 }
 
 void help_unknown_cmd(const char *cmd)