diff --git a/inst/lintr/linters.csv b/inst/lintr/linters.csv
index d61f4d429..c0f12eb53 100644
--- a/inst/lintr/linters.csv
+++ b/inst/lintr/linters.csv
@@ -74,7 +74,7 @@ redundant_equals_linter,best_practices readability efficiency common_mistakes
 redundant_ifelse_linter,best_practices efficiency consistency configurable
 regex_subset_linter,best_practices efficiency
 repeat_linter,style readability
-return_linter,style
+return_linter,style configurable
 routine_registration_linter,best_practices efficiency robustness
 scalar_in_linter,readability consistency best_practices efficiency
 semicolon_linter,style readability default configurable
diff --git a/man/configurable_linters.Rd b/man/configurable_linters.Rd
index 19899dd62..5b559c9b3 100644
--- a/man/configurable_linters.Rd
+++ b/man/configurable_linters.Rd
@@ -38,6 +38,7 @@ The following linters are tagged with 'configurable':
 \item{\code{\link{pipe_consistency_linter}}}
 \item{\code{\link{quotes_linter}}}
 \item{\code{\link{redundant_ifelse_linter}}}
+\item{\code{\link{return_linter}}}
 \item{\code{\link{semicolon_linter}}}
 \item{\code{\link{string_boundary_linter}}}
 \item{\code{\link{todo_comment_linter}}}
diff --git a/man/linters.Rd b/man/linters.Rd
index f7288b205..e2e4ebfb0 100644
--- a/man/linters.Rd
+++ b/man/linters.Rd
@@ -19,7 +19,7 @@ The following tags exist:
 \itemize{
 \item{\link[=best_practices_linters]{best_practices} (53 linters)}
 \item{\link[=common_mistakes_linters]{common_mistakes} (8 linters)}
-\item{\link[=configurable_linters]{configurable} (34 linters)}
+\item{\link[=configurable_linters]{configurable} (35 linters)}
 \item{\link[=consistency_linters]{consistency} (22 linters)}
 \item{\link[=correctness_linters]{correctness} (7 linters)}
 \item{\link[=default_linters]{default} (25 linters)}
@@ -106,7 +106,7 @@ The following linters exist:
 \item{\code{\link{redundant_ifelse_linter}} (tags: best_practices, configurable, consistency, efficiency)}
 \item{\code{\link{regex_subset_linter}} (tags: best_practices, efficiency)}
 \item{\code{\link{repeat_linter}} (tags: readability, style)}
-\item{\code{\link{return_linter}} (tags: style)}
+\item{\code{\link{return_linter}} (tags: configurable, style)}
 \item{\code{\link{routine_registration_linter}} (tags: best_practices, efficiency, robustness)}
 \item{\code{\link{scalar_in_linter}} (tags: best_practices, consistency, efficiency, readability)}
 \item{\code{\link{semicolon_linter}} (tags: configurable, default, readability, style)}
diff --git a/man/return_linter.Rd b/man/return_linter.Rd
index 538eefe3c..855c3a011 100644
--- a/man/return_linter.Rd
+++ b/man/return_linter.Rd
@@ -16,5 +16,5 @@ This linter checks for explicit \code{\link[=return]{return()}} at the end of a
 \link{linters} for a complete list of linters available in lintr.
 }
 \section{Tags}{
-\link[=style_linters]{style}
+\link[=configurable_linters]{configurable}, \link[=style_linters]{style}
 }