diff --git a/community/botan/PKGBUILD b/community/botan/PKGBUILD
index 8bde72860..83134a0cd 100644
--- a/community/botan/PKGBUILD
+++ b/community/botan/PKGBUILD
@@ -11,52 +11,53 @@
 #  - disable neon on !AArch64
 
 pkgname=botan
-pkgver=2.5.0
-pkgrel=4
+pkgver=2.6.0
+pkgrel=1
 pkgdesc='Crypto library written in C++'
 arch=('x86_64')
 url='https://botan.randombit.net/'
 license=('BSD')
-makedepends=('git' 'python')
-# Using a specific commit instead of the .tgz because botan issue #1524
-source=('git+https://github.com/randombit/botan#commit=6c5d9ef3c49658cbf4096e04905e3c0debb9d096'
+depends=('xz')
+makedepends=('python')
+optdepends=('python: for using botan2.py')
+validpgpkeys=('621DAF6411E1851C4CF9A2E16211EBF1EFBADFBC')
+source=("https://botan.randombit.net/releases/Botan-${pkgver}.tgz"{,.asc}
         '0001-aarch64-support.patch')
-md5sums=('SKIP'
-         '37165d2a365dd2e9d779b89fa55ba77b')
-#validpgpkeys=('621DAF6411E1851C4CF9A2E16211EBF1EFBADFBC')
-#source=("https://botan.randombit.net/releases/Botan-${pkgver}.tgz"{,.asc})
-#sha256sums=('b8a31fe03e7f048a5bd3967ecd04b6a48966215e78792df06e333b0eede4fb1b'
-#            'SKIP')
+sha256sums=('c1f261555bba702c73608dde7bd743ef2d6377a41a1c295915b25c5babaf5cc5'
+            'SKIP'
+            '0e279e3b16e115e26f5dc1edf02a4082f063134513aaf6ad1fbd10a1d2624e37')
 
 prepare() {
-  cd "$pkgname"
-  #cd "${pkgname^}-$pkgver"
+  cd "${pkgname^}-$pkgver"
 
   patch -p1 -i ../0001-aarch64-support.patch
 }
 
 build() {
-  cd "$pkgname"
-  #cd "${pkgname^}-$pkgver"
+  cd "${pkgname^}-$pkgver"
 
   [[ $CARCH != "aarch64" ]] && CONFIG="--disable-neon"
 
-  # botan benefits from -O3, and the developers runs tests with it
-  CXXFLAGS="$CXXFLAGS -O3" ./configure.py --prefix=/usr --with-bzip --with-zlib --with-lzma $CONFIG
+  # botan benefits from -O3, and upstream devs are running benchmarks with it
+  CXXFLAGS="$CXXFLAGS -O3" ./configure.py \
+    --prefix=/usr \
+    --with-bzip \
+    --with-zlib \
+    --with-lzma \
+    $CONFIG
   make
 }
 
 check() {
-  cd "$pkgname"
+  cd "${pkgname^}-$pkgver"
 
   ./botan-test
 }
 
 package() {
-  cd "$pkgname"
-
-  make DESTDIR="$pkgdir" install
-  install -Dm644 license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  DESTDIR="$pkgdir" make -C "${pkgname^}-$pkgver" install
+  install -Dm644 "${pkgname^}-$pkgver/license.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # getver: github.com/randombit/botan