diff --git a/Makefile b/Makefile
index 1d86c2ed0..bfa1731f0 100644
--- a/Makefile
+++ b/Makefile
@@ -153,6 +153,7 @@ Rpack: clean_all
 	bash R-package/remove_warning_suppression_pragma.sh
 	bash xgboost/remove_warning_suppression_pragma.sh
 	rm xgboost/remove_warning_suppression_pragma.sh
+	rm xgboost/CMakeLists.txt
 	rm -rfv xgboost/tests/helper_scripts/
 
 R ?= R
diff --git a/R-package/DESCRIPTION b/R-package/DESCRIPTION
index 01601403c..a2321f290 100644
--- a/R-package/DESCRIPTION
+++ b/R-package/DESCRIPTION
@@ -6,7 +6,7 @@ Date: 2021-09-25
 Authors@R: c(
   person("Tianqi", "Chen", role = c("aut"),
          email = "tianqi.tchen@gmail.com"),
-  person("Tong", "He", role = c("aut", "cre"),
+  person("Tong", "He", role = c("aut"),
          email = "hetong007@gmail.com"),
   person("Michael", "Benesty", role = c("aut"),
          email = "michael@benesty.fr"),
@@ -26,7 +26,8 @@ Authors@R: c(
   person("Min", "Lin", role = c("aut")),
   person("Yifeng", "Geng", role = c("aut")),
   person("Yutian", "Li", role = c("aut")),
-  person("Jiaming", "Yuan", role = c("aut")),
+  person("Jiaming", "Yuan", role = c("aut", "cre"),
+         email = "jm.yuan@outlook.com"),
   person("XGBoost contributors", role = c("cph"),
          comment = "base XGBoost implementation")
   )
diff --git a/doc/contrib/release.rst b/doc/contrib/release.rst
index 2f80a37be..c457c6560 100644
--- a/doc/contrib/release.rst
+++ b/doc/contrib/release.rst
@@ -32,7 +32,7 @@ Making a Release
 
    + The pip package is maintained by `Hyunsu Cho <https://github.com/hcho3>`__ and `Jiaming Yuan <https://github.com/trivialfis>`__.  There's a helper script for downloading pre-built wheels and R packages ``xgboost/dev/release-pypi-r.py`` along with simple instructions for using ``twine``.
 
-   + The CRAN package is maintained by `Tong He <https://github.com/hetong007>`_.
+   + The CRAN package is maintained by `Tong He <https://github.com/hetong007>`_ and `Jiaming Yuan <https://github.com/trivialfis>`__.
 
      Before submitting a release, one should test the package on `R-hub <https://builder.r-hub.io/>`__ and `win-builder <https://win-builder.r-project.org/>`__ first.  Please note that the R-hub Windows instance doesn't have the exact same environment as the one hosted on win-builder.