diff --git a/x86_64/community-testing/PKGBUILD b/x86_64/community-testing/PKGBUILD
deleted file mode 100644
index f870ea9..0000000
--- a/x86_64/community-testing/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto@archlinux.org>
-# Contributor: Angel 'angvp' Velasquez <angvp@archlinux.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
-# Contributor: Patrick Melo <patrick@patrickmelo.eti.br>
-
-pkgname=geany-plugins
-pkgver=1.38
-pkgrel=3
-pkgdesc='Plugins for Geany'
-arch=(x86_64)
-url='https://plugins.geany.org/'
-license=(GPL)
-depends=(ctpl "geany>=$pkgver" gpgme gtkspell3 libgit2 lua51 python vte3 webkit2gtk)
-makedepends=(cppcheck intltool)
-source=(
-  "$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig}
-  $pkgname-1.38-libgit2_1.4.patch
-)
-b2sums=('a2fd9e59218e4b5359b910ccff8d0a6504845081f827d2f1c798ea6401914e8e01222c784a76ab0a126f5fe07c8aa86018cef4c71bb5e2891193f6c8965a3e47'
-        'SKIP'
-        '8daf8357caf09eb62844b6c44fa2a819231879b6d7e69bde4039f87230419cf371d1e8b5dede2f23dbb65d5d652b0bce3e51c79164ab8e3d76b445130cd5d387')
-validpgpkeys=('986FA7E80256D3D16F30FB7A01380DF54FD09D02') # Frank Lanitz <frank@geany.org>
-
-prepare() {
-  # fix for changes to git_buf with libgit2 >= 1.4
-  # https://github.com/geany/geany-plugins/issues/1164
-  patch -d $pkgname-$pkgver -p1 -i ../$pkgname-1.38-libgit2_1.4.patch
-
-  cd $pkgname-$pkgver
-  autoreconf -fi
-
-  # don't redefine bool
-  sed -i 's/typedef unsigned int bool/#include <stdbool.h>/g' \
-    pretty-printer/src/PrettyPrinter.h
-}
-
-build() {
-  cd $pkgname-$pkgver
-  export CFLAGS+=' -w'
-  export PYTHON=/usr/bin/python
-  ./configure --prefix=/usr --libexecdir=/usr/lib
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
-}
-
-# getver: plugins.geany.org/downloads.html
diff --git a/x86_64/community/PKGBUILD b/x86_64/community/PKGBUILD
index ad6636b..f870ea9 100644
--- a/x86_64/community/PKGBUILD
+++ b/x86_64/community/PKGBUILD
@@ -5,19 +5,27 @@
 
 pkgname=geany-plugins
 pkgver=1.38
-pkgrel=2
+pkgrel=3
 pkgdesc='Plugins for Geany'
 arch=(x86_64)
 url='https://plugins.geany.org/'
 license=(GPL)
 depends=(ctpl "geany>=$pkgver" gpgme gtkspell3 libgit2 lua51 python vte3 webkit2gtk)
 makedepends=(cppcheck intltool)
-source=("$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig})
+source=(
+  "$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig}
+  $pkgname-1.38-libgit2_1.4.patch
+)
 b2sums=('a2fd9e59218e4b5359b910ccff8d0a6504845081f827d2f1c798ea6401914e8e01222c784a76ab0a126f5fe07c8aa86018cef4c71bb5e2891193f6c8965a3e47'
-        'SKIP')
+        'SKIP'
+        '8daf8357caf09eb62844b6c44fa2a819231879b6d7e69bde4039f87230419cf371d1e8b5dede2f23dbb65d5d652b0bce3e51c79164ab8e3d76b445130cd5d387')
 validpgpkeys=('986FA7E80256D3D16F30FB7A01380DF54FD09D02') # Frank Lanitz <frank@geany.org>
 
 prepare() {
+  # fix for changes to git_buf with libgit2 >= 1.4
+  # https://github.com/geany/geany-plugins/issues/1164
+  patch -d $pkgname-$pkgver -p1 -i ../$pkgname-1.38-libgit2_1.4.patch
+
   cd $pkgname-$pkgver
   autoreconf -fi
 
diff --git a/x86_64/community-testing/geany-plugins-1.38-libgit2_1.4.patch b/x86_64/community/geany-plugins-1.38-libgit2_1.4.patch
similarity index 100%
rename from x86_64/community-testing/geany-plugins-1.38-libgit2_1.4.patch
rename to x86_64/community/geany-plugins-1.38-libgit2_1.4.patch