diff --git a/community/boinc/PKGBUILD b/community/boinc/PKGBUILD
index b7f666e3d..8ec7452ba 100644
--- a/community/boinc/PKGBUILD
+++ b/community/boinc/PKGBUILD
@@ -8,34 +8,33 @@
 
 pkgbase=boinc
 pkgname=(boinc boinc-nox)
-pkgver=7.20.4
-_tag="client_release/7.20/$pkgver"
+pkgver=7.20.5
+_commit=4774e1cbe0ad13cb9a6f7fffbb626a417316f61d
 pkgrel=1
 arch=('x86_64')
 url="https://boinc.berkeley.edu/"
 license=('LGPL')
-makedepends=('curl' 'freeglut' 'glu' 'inetutils' 'libnotify' 'libnsl' 'libxmu' 'libxslt' 'libxss'
+makedepends=('git' 'curl' 'freeglut' 'glu' 'inetutils' 'libnotify' 'libnsl' 'libxmu' 'libxslt' 'libxss'
              'mesa' 'perl-xml-sax' 'sqlite3' 'webkit2gtk' 'wxwidgets-gtk3')
 install=$pkgbase.install
 options=('!staticlibs')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/BOINC/boinc/archive/$_tag.tar.gz"
+source=("git+https://github.com/BOINC/boinc.git#commit=$_commit"
         boinc.bash
         boinc.desktop
         boinc.sysusers)
-sha512sums=('6103027d6a4f2c0dfce0860aa73238a5c21504f2d185dd607bdf39a09394a4550b3111452659b453fdb9fee82000a97b33bc51656b5f45533ccd455ff49b01c7'
+sha512sums=('SKIP'
             'dec4bb6e571c2d99e1f57295149399eee03a8ec41b07ec3f7f197b910d246dcd6a5eb880301c9cd3a039d8c5aa6b07babf6ab4cae5f242c419c8cd71f56b90f5'
             'b3fcd703a6f683d246242543c2f7b5fcfe403cb95b7786f1418b24c3dfb7c54c6b8c4816c0e9ae56b5ee4e4cae63f153ec522b04bf02f4f835dd90ac0e0ae204'
             '85804d7e6b7e07f06e93e8c42507f5cd0b9415257d6ac7421603a2b6084699d847ae9720c1cf9e9793b750dfb768375116843b988b287ee7c66c1374e18f7934')
 
 prepare() {
-  mv boinc-client_release-*-$pkgver $pkgbase-$pkgver
-  cp -a "$srcdir"/$pkgbase-$pkgver{,-nox}
+  cp -a boinc{,-nox}
 
-  cd $pkgbase-$pkgver
+  cd boinc
   ./_autosetup
 
   # Prepare boinc-nox
-  cd "$srcdir"/$pkgbase-$pkgver-nox
+  cd "$srcdir"/boinc-nox
   # Don't force xss
   sed -i 's/^  enable_xss="yes"$/  enable_xss="no"/' configure.ac
   ./_autosetup
@@ -44,7 +43,7 @@ prepare() {
 build() {
   [[ $CARCH == "armv7h" ]] && CONFIG="--with-boinc-alt-platform=arm-unknown-linux-gnueabihf"
 
-  cd "$srcdir"/$pkgbase-$pkgver
+  cd "$srcdir"/boinc
   export CXXFLAGS+=' -ffat-lto-objects'
   LDFLAGS+=' -lX11' ./configure \
     --prefix=/usr \
@@ -65,7 +64,7 @@ build() {
   make
 
   # Build boinc-nox
-  cd "$srcdir"/$pkgbase-$pkgver-nox
+  cd "$srcdir"/boinc-nox
   PKG_CONFIG=/usr/bin/pkg-config ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -88,21 +87,21 @@ package_boinc() {
   pkgdesc="Berkeley Open Infrastructure for Network Computing for desktop"
   depends=('curl' 'libnotify' 'libnsl' 'libxss' 'sqlite3' 'webkit2gtk' 'wxwidgets-gtk3')
 
-  cd $pkgbase-$pkgver
+  cd boinc
 
   make DESTDIR="$pkgdir" install
 
   #install sysusers conf
-  install -Dm644 "${srcdir}/$pkgbase.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgbase.conf"
+  install -Dm644 "$srcdir/$pkgbase.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgbase.conf"
 
   #install bash-completion
-  install -Dm644 "${srcdir}/$pkgbase.bash" "${pkgdir}/usr/share/bash-completion/completions/$pkgbase"
+  install -Dm644 "$srcdir/$pkgbase.bash" "$pkgdir/usr/share/bash-completion/completions/$pkgbase"
 
   #install .desktop File
-  install -Dm644 "${srcdir}/$pkgbase.desktop" "${pkgdir}/usr/share/applications/$pkgbase.desktop"
+  install -Dm644 "$srcdir/$pkgbase.desktop" "$pkgdir/usr/share/applications/$pkgbase.desktop"
 
   #install icons
-  install -Dm644 "${srcdir}/$pkgbase-$pkgver/packages/generic/sea/boincmgr.48x48.png" "${pkgdir}/usr/share/pixmaps/$pkgbase.png"
+  install -Dm644 "$srcdir/boinc/packages/generic/sea/boincmgr.48x48.png" "$pkgdir/usr/share/pixmaps/$pkgbase.png"
 
   #remove initscripts stuff
   rm -rf "$pkgdir/etc"
@@ -114,15 +113,15 @@ package_boinc-nox() {
   provides=('boinc')
   conflicts=('boinc')
 
-  cd $pkgbase-$pkgver-nox
+  cd boinc-nox
 
   make DESTDIR="$pkgdir" install
 
   #install sysusers conf
-  install -Dm644 "${srcdir}/$pkgbase.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgbase.conf"
+  install -Dm644 "$srcdir/$pkgbase.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgbase.conf"
 
   #install bash-completion
-  install -Dm644 "${srcdir}/$pkgbase.bash" "${pkgdir}/usr/share/bash-completion/completions/$pkgbase"
+  install -Dm644 "$srcdir/$pkgbase.bash" "$pkgdir/usr/share/bash-completion/completions/$pkgbase"
 
   #remove initscripts stuff
   rm -rf "$pkgdir/etc"