diff --git a/dev-R/commonmark/commonmark-1.7.ebuild b/dev-R/commonmark/commonmark-1.7.ebuild
index 42652afb26..ba9e02b5fe 100644
--- a/dev-R/commonmark/commonmark-1.7.ebuild
+++ b/dev-R/commonmark/commonmark-1.7.ebuild
@@ -3,10 +3,15 @@
 
 EAPI=7
 
-inherit R-packages
+inherit R-packages toolchain-funcs
 
 DESCRIPTION='High Performance CommonMark and github markdown rendering in R'
 KEYWORDS="~amd64"
 LICENSE='BSD-2'
 
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	tc-export AR
+	R-packages_src_prepare
+}
diff --git a/dev-R/commonmark/metadata.xml b/dev-R/commonmark/metadata.xml
index 3a943e3345..a18e9885fe 100644
--- a/dev-R/commonmark/metadata.xml
+++ b/dev-R/commonmark/metadata.xml
@@ -16,4 +16,14 @@
 		opt-in support for GFM extensions including tables, autolinks,
 		and strikethrough text.
 	</longdescription>
+	<upstream>
+		<bugs-to>http://github.com/jeroen/commonmark/issues</bugs-to>
+		<doc lang="en">https://cran.r-project.org/web/packages/commonmark/commonmark.pdf</doc>
+		<changelog>https://cran.r-project.org/web/packages/commonmark/NEWS</changelog>
+		<maintainer>
+			<name>Jeroen Ooms</name>
+			<email>jeroen@berkeley.edu</email>
+		</maintainer>
+		<remote-id type="github">jeroen/commonmark</remote-id>
+	</upstream>
 </pkgmetadata>