diff --git a/BioArchLinux/avogadro2/PKGBUILD b/BioArchLinux/avogadro2/PKGBUILD
index 13c8862a03..03a09eafb5 100644
--- a/BioArchLinux/avogadro2/PKGBUILD
+++ b/BioArchLinux/avogadro2/PKGBUILD
@@ -1,40 +1,36 @@
-# Maintainer: Eric Berquist <eric DOT berquist AT gmail DOT com>
+# Maintainer:  Anton Kudelin <kudelin at protonmail dot com>
+# Contributor: James Barnett < james at wbarnett dot us >
 
 pkgname=avogadro2
-_gitname=avogadroapp
+_pkgname=avogadroapp
 pkgver=1.95.1
-pkgrel=1
-pkgdesc="an advanced molecular editor designed for cross-platform use in computational chemistry, molecular modeling, bioinformatics, materials science, and related areas."
-url="http://openchemistry.org/projects/avogadro2"
-arch=("x86_64")
-license=("BSD-3-Clause")
-depends=("avogadro2libs" "desktop-file-utils")
-makedepends=("cmake" "eigen" "git")
-install=avogadro2.install
-conflicts=("${pkgname}")
-provides=("${pkgname}")
-source=("${pkgname}::https://github.com/OpenChemistry/avogadroapp/archive/refs/tags/${pkgver}.zip")
-sha256sums=('b5db11747d20fab956149e04e7111eb56c6696c8ea9483f242f897613705fa7f')
-
-prepare() {
-  mkdir -p "${srcdir}"/build
-}
+pkgrel=4
+pkgdesc="An advanced molecular editor"
+arch=('x86_64')
+url="https://two.avogadro.cc"
+license=('BSD')
+depends=('avogadrolibs-qt5' 'python-cclib' 'vtk' 'qt5-x11extras' 'pugixml'
+         'utf8cpp' 'fmt')
+optdepends=('openbabel: Open Babel plugin actions')
+makedepends=('make' 'cmake' 'eigen')
+provides=('avogadro2')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/OpenChemistry/$_pkgname/archive/$pkgver.tar.gz")
+sha256sums=('d59694a6b32bb95317c66f4c806fe05d46e7e3ca4e594aa214bf9dd7e179b317')
 
 build() {
-  cd "${srcdir}"/build
-  cmake \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_INSTALL_LIBDIR=lib \
-      -DBUILD_SHARED_LIBS=ON \
-      -DENABLE_TESTING=OFF \
-      -DUSE_VTK=ON \
-      "${srcdir}/${_gitname}-$pkgver"
+  mkdir -p "$srcdir/build"
+  cd $srcdir/build
+  cmake "$srcdir/$_pkgname-$pkgver" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DUSE_VTK=ON
   make
 }
 
 package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-  install -D -m 644 "${srcdir}/${_gitname}-$pkgver"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd build
+  make DESTDIR="$pkgdir" install
+  install -dm755 "$pkgdir/usr/share/licenses/_$pkgname"
+  install -m755 "$srcdir/$_pkgname-$pkgver/LICENSE" \
+  "$pkgdir/usr/share/licenses/$_pkgname"
 }
diff --git a/BioArchLinux/avogadro2/avogadro2.install b/BioArchLinux/avogadro2/avogadro2.install
deleted file mode 100644
index 2eaa60550d..0000000000
--- a/BioArchLinux/avogadro2/avogadro2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/BioArchLinux/avogadro2/lilac.yaml b/BioArchLinux/avogadro2/lilac.yaml
index a535a53fd1..9e0a58ded6 100644
--- a/BioArchLinux/avogadro2/lilac.yaml
+++ b/BioArchLinux/avogadro2/lilac.yaml
@@ -7,4 +7,4 @@ update_on:
     github: OpenChemistry/avogadroapp
     use_max_tag: true
 repo_depends:
-  -  avogadro2libs
+  -  python-cclib
diff --git a/fail/python-cclib/.gitignore b/BioArchLinux/python-cclib/.gitignore
similarity index 100%
rename from fail/python-cclib/.gitignore
rename to BioArchLinux/python-cclib/.gitignore
diff --git a/fail/python-cclib/PKGBUILD b/BioArchLinux/python-cclib/PKGBUILD
similarity index 100%
rename from fail/python-cclib/PKGBUILD
rename to BioArchLinux/python-cclib/PKGBUILD
diff --git a/fail/python-cclib/lilac.py b/BioArchLinux/python-cclib/lilac.py
similarity index 100%
rename from fail/python-cclib/lilac.py
rename to BioArchLinux/python-cclib/lilac.py
diff --git a/fail/python-cclib/lilac.yaml b/BioArchLinux/python-cclib/lilac.yaml
similarity index 100%
rename from fail/python-cclib/lilac.yaml
rename to BioArchLinux/python-cclib/lilac.yaml
diff --git a/fail/python-periodictable/PKGBUILD b/BioArchLinux/python-periodictable/PKGBUILD
similarity index 100%
rename from fail/python-periodictable/PKGBUILD
rename to BioArchLinux/python-periodictable/PKGBUILD
diff --git a/fail/python-periodictable/lilac.py b/BioArchLinux/python-periodictable/lilac.py
similarity index 100%
rename from fail/python-periodictable/lilac.py
rename to BioArchLinux/python-periodictable/lilac.py
diff --git a/fail/python-periodictable/lilac.yaml b/BioArchLinux/python-periodictable/lilac.yaml
similarity index 100%
rename from fail/python-periodictable/lilac.yaml
rename to BioArchLinux/python-periodictable/lilac.yaml