diff --git a/BioArchLinux/r-annotationdbi/PKGBUILD b/BioArchLinux/r-annotationdbi/PKGBUILD
index e17aff743d..649092f1b2 100644
--- a/BioArchLinux/r-annotationdbi/PKGBUILD
+++ b/BioArchLinux/r-annotationdbi/PKGBUILD
@@ -1,16 +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: Nick B <Shirakawasuna at gmail _dot_com>
 
 _pkgname=AnnotationDbi
 _pkgver=1.62.2
 pkgname=r-${_pkgname,,}
-pkgver=1.62.2
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc='Manipulation of SQLite-based annotations in Bioconductor'
-arch=('any')
+pkgdesc="Manipulation of SQLite-based annotations in Bioconductor"
+arch=(any)
 url="https://bioconductor.org/packages/${_pkgname}"
-license=('Artistic2.0')
+license=(Artistic2.0)
 depends=(
-  r
   r-biobase
   r-biocgenerics
   r-dbi
@@ -33,17 +34,17 @@ optdepends=(
   r-reactome.db
   r-runit
   r-txdb.hsapiens.ucsc.hg19.knowngene
-  r-utils
 )
 source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('e12679a9cb4533c5f24fc27458b8d8e6')
 sha256sums=('893743dafad619a9742e67944b8b8df5431b967fc3edf4e6b4eea63309aaf96e')
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 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-annotationdbi/lilac.py b/BioArchLinux/r-annotationdbi/lilac.py
index bd219c037c..b5cdb057c5 100644
--- a/BioArchLinux/r-annotationdbi/lilac.py
+++ b/BioArchLinux/r-annotationdbi/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-annotationdbi/lilac.yaml b/BioArchLinux/r-annotationdbi/lilac.yaml
index 75c2597ee8..eeb2b4a546 100644
--- a/BioArchLinux/r-annotationdbi/lilac.yaml
+++ b/BioArchLinux/r-annotationdbi/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-biobase
 - r-biocgenerics
@@ -11,7 +11,8 @@ repo_depends:
 - r-rsqlite
 - r-s4vectors
 update_on:
-- regex: AnnotationDbi_([\d._-]+).tar.gz
-  source: regex
-  url: https://bioconductor.org/packages/AnnotationDbi
+- source: rpkgs
+  pkgname: AnnotationDbi
+  repo: bioc
+  md5: true
 - alias: r