diff --git a/modules/openapi-generator/src/main/resources/r/Rbuildignore.mustache b/modules/openapi-generator/src/main/resources/r/Rbuildignore.mustache
index 512c98c13399..b270aa54fb10 100644
--- a/modules/openapi-generator/src/main/resources/r/Rbuildignore.mustache
+++ b/modules/openapi-generator/src/main/resources/r/Rbuildignore.mustache
@@ -1,9 +1,18 @@
-^.*\.Rproj$
-^\.Rproj\.user$
+^.*\.Rproj$         # Designates the directory as an RStudio Project
+^\.Rproj\.user$     # Used by RStudio for temporary files
+^README\.Rmd$       # An Rmd file used to generate README.md
+^LICENSE\.md$       # Full text of the license
+^cran-comments\.md$ # Comments for CRAN submission
+^data-raw$          # Code used to create data included in the package
+^pkgdown$           # Resources used for the package website
+^_pkgdown\.yml$     # Configuration info for the package website
+^\.github$          # Contributing guidelines, CoC, issue templates, etc.
+^\.Rhistory$
+^\.gitignore$
 ^\.openapi-generator-ignore$
 ^\.travis\.yml$
 ^\.openapi-generator$
 ^docs$
 ^git_push\.sh$
-^README\.md$
-^cran-comments\.md$
\ No newline at end of file
+^{{{packageName}}}\.Rcheck$
+^\.\.Rcheck$
diff --git a/samples/client/petstore/R/.Rbuildignore b/samples/client/petstore/R/.Rbuildignore
index 512c98c13399..e146ddffb845 100644
--- a/samples/client/petstore/R/.Rbuildignore
+++ b/samples/client/petstore/R/.Rbuildignore
@@ -1,9 +1,18 @@
-^.*\.Rproj$
-^\.Rproj\.user$
+^.*\.Rproj$         # Designates the directory as an RStudio Project
+^\.Rproj\.user$     # Used by RStudio for temporary files
+^README\.Rmd$       # An Rmd file used to generate README.md
+^LICENSE\.md$       # Full text of the license
+^cran-comments\.md$ # Comments for CRAN submission
+^data-raw$          # Code used to create data included in the package
+^pkgdown$           # Resources used for the package website
+^_pkgdown\.yml$     # Configuration info for the package website
+^\.github$          # Contributing guidelines, CoC, issue templates, etc.
+^\.Rhistory$
+^\.gitignore$
 ^\.openapi-generator-ignore$
 ^\.travis\.yml$
 ^\.openapi-generator$
 ^docs$
 ^git_push\.sh$
-^README\.md$
-^cran-comments\.md$
\ No newline at end of file
+^petstore\.Rcheck$
+^\.\.Rcheck$