diff --git a/BioArchLinux/r-ggwordcloud/PKGBUILD b/BioArchLinux/r-ggwordcloud/PKGBUILD
index d4409d9687..9d80e6d77b 100644
--- a/BioArchLinux/r-ggwordcloud/PKGBUILD
+++ b/BioArchLinux/r-ggwordcloud/PKGBUILD
@@ -1,22 +1,27 @@
-# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
 _pkgname=ggwordcloud
-_pkgver=0.5.0
+_pkgver=0.6.0
 pkgname=r-${_pkgname,,}
-pkgver=0.5.0
-pkgrel=6
+pkgver=${_pkgver//-/.}
+pkgrel=0
 pkgdesc="A Word Cloud Geom for 'ggplot2'"
-arch=('x86_64')
+arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL3)
 depends=(
-  r
   r-colorspace
   r-ggplot2
+  r-gridtext
   r-png
   r-rcpp
   r-scales
 )
+checkdepends=(
+  r-testthat
+  ttf-font
+)
 optdepends=(
   r-covr
   r-dplyr
@@ -29,14 +34,20 @@ optdepends=(
   r-wordcloud2
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('c83644335fda3fafa57263bb28dd1e1c6b4c9d68b0e4594de5490e8dc6112957')
+md5sums=('8444d39059adaf9afed348bf472f5535')
+sha256sums=('df0b5a275c29a8e441a8bf60d8008a60ed443119db6b11cab1ba61e2c8a599de')
 
 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-ggwordcloud/lilac.py b/BioArchLinux/r-ggwordcloud/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-ggwordcloud/lilac.py
+++ b/BioArchLinux/r-ggwordcloud/lilac.py
@@ -1,12 +1,13 @@
 #!/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)
 
 def post_build():
     git_pkgbuild_commit()
diff --git a/BioArchLinux/r-ggwordcloud/lilac.yaml b/BioArchLinux/r-ggwordcloud/lilac.yaml
index 6dcfd5a708..ed13cabfce 100644
--- a/BioArchLinux/r-ggwordcloud/lilac.yaml
+++ b/BioArchLinux/r-ggwordcloud/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-colorspace
 - r-ggplot2
+- r-gridtext
 - r-png
 - r-rcpp
 - r-scales
+repo_makedepends:
+- r-testthat
 update_on:
-- regex: ggwordcloud_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=ggwordcloud
+- source: rpkgs
+  pkgname: ggwordcloud
+  repo: cran
+  md5: true
 - alias: r