diff --git a/BioArchLinux/r-tiledb/PKGBUILD b/BioArchLinux/r-tiledb/PKGBUILD
index 56739d8baf..f379f3a00b 100644
--- a/BioArchLinux/r-tiledb/PKGBUILD
+++ b/BioArchLinux/r-tiledb/PKGBUILD
@@ -1,26 +1,36 @@
-# system requirements: A C++17 compiler is required, and on macOScompilation for version 11.14 is required. Optionally cmake(only when TileDB source build selected), git (only when TileDBsource build selected); on x86_64 and M1 platforms pre-builtTileDB Embedded libraries are available at GitHub and are usedif no TileDB installation is detected, and no other option tobuild or download was specified by the user.
-# 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=tiledb
-_pkgver=0.21.0
+_pkgver=0.21.1
 pkgname=r-${_pkgname,,}
-pkgver=0.21.0
-pkgrel=1
-pkgdesc='Universal Storage Engine for Sparse and Dense Multidimensional Arrays'
-arch=('x86_64')
+pkgver=${_pkgver//-/.}
+pkgrel=0
+pkgdesc="Universal Storage Engine for Sparse and Dense Multidimensional Arrays"
+arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('MIT')
+license=(MIT)
 depends=(
-  r
   r-nanotime
   r-rcpp
   r-spdl
+  tiledb
+)
+makedepends=(
+  r-rcppint64
+)
+checkdepends=(
+  r-arrow
+  r-data.table
+  r-nycflights13
+  r-palmerpenguins
+  r-tinytest
 )
 optdepends=(
+  r-arrow
   r-bit64
   r-curl
   r-data.table
-  r-matrix
   r-nycflights13
   r-palmerpenguins
   r-simplermarkdown
@@ -28,15 +38,23 @@ optdepends=(
   r-tinytest
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('751bf188a9cc66f9facd88f7a651e8b92a99fffca211f73d92352066c4684364')
+md5sums=('1302cc88d721a045769384062c48b0f9')
+sha256sums=('95ffa28b08d1dc2c33772d9d1a1cb8228883a8fa6936ccde45161d15883df568')
 
 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" Rscript --vanilla tinytest.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
-  install -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
+
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }
-# vim:set ts=2 sw=2 et:
diff --git a/BioArchLinux/r-tiledb/lilac.py b/BioArchLinux/r-tiledb/lilac.py
index bd219c037c..aacb63818b 100644
--- a/BioArchLinux/r-tiledb/lilac.py
+++ b/BioArchLinux/r-tiledb/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_systemrequirements = "A C++17 compiler is required, and on macOS compilation for version 11.14 is required. Optionally cmake (only when TileDB source build selected), git (only when TileDB source build selected); on x86_64 and M1 platforms pre-built TileDB Embedded libraries are available at GitHub and are used if no TileDB installation is detected, and no other option to build or download was specified by the user.",
+    )
 
 def post_build():
     git_pkgbuild_commit()
diff --git a/BioArchLinux/r-tiledb/lilac.yaml b/BioArchLinux/r-tiledb/lilac.yaml
index c480e42bf5..8c59f3e4a1 100644
--- a/BioArchLinux/r-tiledb/lilac.yaml
+++ b/BioArchLinux/r-tiledb/lilac.yaml
@@ -1,13 +1,24 @@
 build_prefix: extra-x86_64
 maintainers:
-- github: starsareintherose
-  email: kuoi@bioarchlinux.org
+- github: pekkarr
+  email: pekkarr@protonmail.com
 repo_depends:
 - r-nanotime
 - r-rcpp
 - r-spdl
+- tiledb
+repo_makedepends:
+- r-rcppint64
+- r-arrow
+- r-data.table
+- r-nycflights13
+- r-palmerpenguins
+- r-tinytest
 update_on:
-- regex: tiledb_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=tiledb
+- source: rpkgs
+  pkgname: tiledb
+  repo: cran
+  md5: true
 - alias: r
+update_on_build:
+- pkgbase: tiledb