diff --git a/BioArchLinux/r-shiny/PKGBUILD b/BioArchLinux/r-shiny/PKGBUILD
index 4412c3d76b..8c9175f0ff 100644
--- a/BioArchLinux/r-shiny/PKGBUILD
+++ b/BioArchLinux/r-shiny/PKGBUILD
@@ -1,17 +1,17 @@
-# 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=shiny
 _pkgver=1.7.5.1
 pkgname=r-${_pkgname,,}
-pkgver=1.7.5.1
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='Web Application Framework for R'
-arch=('any')
+pkgdesc="Web Application Framework for R"
+arch=(any)
 url="https://cran.r-project.org/package=${_pkgname}"
-license=('GPL')
+license=(GPL3)
 depends=(
-  r
   r-bslib
   r-cachem
   r-commonmark
@@ -33,9 +33,14 @@ depends=(
   r-withr
   r-xtable
 )
+checkdepends=(
+  r-future
+  r-ggplot2
+  r-testthat
+  ttf-font
+)
 optdepends=(
   r-cairo
-  r-datasets
   r-dygraphs
   r-future
   r-ggplot2
@@ -51,14 +56,20 @@ optdepends=(
   r-yaml
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('9fba1a63a8d0f3fe58e3e9ce1ee89e49')
 sha256sums=('2023d91cc8039580752f6ecc5010d4419b7d928724ce5b10b93a3b48e1e6fb46')
 
 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-shiny/lilac.py b/BioArchLinux/r-shiny/lilac.py
index bd219c037c..b5d481821a 100644
--- a/BioArchLinux/r-shiny/lilac.py
+++ b/BioArchLinux/r-shiny/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-shiny/lilac.yaml b/BioArchLinux/r-shiny/lilac.yaml
index decdba1c2d..53f4e3460a 100644
--- a/BioArchLinux/r-shiny/lilac.yaml
+++ b/BioArchLinux/r-shiny/lilac.yaml
@@ -1,7 +1,7 @@
 build_prefix: extra-x86_64
 maintainers:
-- github: starsareintherose
-  email: kuoi@bioarchlinux.org
+- github: pekkarr
+  email: pekkarr@protonmail.com
 repo_depends:
 - r-bslib
 - r-cachem
@@ -23,8 +23,13 @@ repo_depends:
 - r-sourcetools
 - r-withr
 - r-xtable
+repo_makedepends:
+- r-future
+- r-ggplot2
+- r-testthat
 update_on:
-- regex: shiny_([\d._-]+).tar.gz
-  source: regex
-  url: https://cran.r-project.org/package=shiny
+- source: rpkgs
+  pkgname: shiny
+  repo: cran
+  md5: true
 - alias: r