diff --git a/BioArchLinux/r-ggrepel/PKGBUILD b/BioArchLinux/r-ggrepel/PKGBUILD
index f23b2bb699..0cd7493369 100644
--- a/BioArchLinux/r-ggrepel/PKGBUILD
+++ b/BioArchLinux/r-ggrepel/PKGBUILD
@@ -1,23 +1,28 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _pkgname=ggrepel
 _pkgver=0.9.4
 pkgname=r-${_pkgname,,}
-pkgver=0.9.4
+pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc="Automatically Position Non-Overlapping Text Labels with 'ggplot2'"
-arch=('x86_64')
+arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL3)
 depends=(
-  r
   r-ggplot2
   r-rcpp
   r-rlang
   r-scales
   r-withr
 )
+checkdepends=(
+  r-testthat
+  r-vdiffr
+  ttf-font
+)
 optdepends=(
   r-devtools
   r-dplyr
@@ -34,14 +39,20 @@ optdepends=(
   r-vdiffr
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('80614592620fcaa8a11f99995ecec94b')
 sha256sums=('81abb47270593709587480ffbc88dce3d3f695bd6f1164729311b37c50d7cf3e')
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
+}
+
+check() {
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 }
-# vim:set ts=2 sw=2 et:
diff --git a/BioArchLinux/r-ggrepel/lilac.py b/BioArchLinux/r-ggrepel/lilac.py
index bd219c037c..b5d481821a 100644
--- a/BioArchLinux/r-ggrepel/lilac.py
+++ b/BioArchLinux/r-ggrepel/lilac.py
@@ -1,12 +1,16 @@
 #!/usr/bin/env python3
 from lilaclib import *
 
+import os
+import sys
+sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
+from lilac_r_utils import r_pre_build
+
 def pre_build():
-    for line in edit_file('PKGBUILD'):
-        if line.startswith('_pkgver='):
-            line = f'_pkgver={_G.newver}'
-        print(line)
-    update_pkgver_and_pkgrel(_G.newver.replace(':', '.').replace('-', '.'))
+    r_pre_build(
+        _G,
+        expect_license = "GPL-3 | file LICENSE",
+    )
 
 def post_build():
     git_pkgbuild_commit()
diff --git a/BioArchLinux/r-ggrepel/lilac.yaml b/BioArchLinux/r-ggrepel/lilac.yaml
index 4a355c4832..3087eea5e8 100644
--- a/BioArchLinux/r-ggrepel/lilac.yaml
+++ b/BioArchLinux/r-ggrepel/lilac.yaml
@@ -1,15 +1,19 @@
 build_prefix: extra-x86_64
 maintainers:
-- github: starsareintherose
-  email: kuoi@bioarchlinux.org
+- github: pekkarr
+  email: pekkarr@protonmail.com
 repo_depends:
 - r-ggplot2
 - r-rcpp
 - r-rlang
 - r-scales
 - r-withr
+repo_makedepends:
+- r-testthat
+- r-vdiffr
 update_on:
-- regex: ggrepel_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=ggrepel
+- source: rpkgs
+  pkgname: ggrepel
+  repo: cran
+  md5: true
 - alias: r