diff --git a/community/boinc/PKGBUILD b/community/boinc/PKGBUILD
index d2dbe2cf2..105c4ac65 100644
--- a/community/boinc/PKGBUILD
+++ b/community/boinc/PKGBUILD
@@ -11,7 +11,7 @@ pkgbase=boinc
 pkgname=(boinc boinc-nox)
 pkgver=7.6.31
 _tag="client_release/7.6/$pkgver"
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://boinc.berkeley.edu/"
 license=('LGPL')
@@ -32,12 +32,15 @@ md5sums=('SKIP'
          'e27047518dec54d4db38816487a28661')
 
 prepare() {
-  cd "$srcdir/$pkgbase"
-  patch -Np1 -i "${srcdir}/boinc-AM_CONDITIONAL.patch"
+  cd $pkgbase
+  patch -Np1 -i "$srcdir"/boinc-AM_CONDITIONAL.patch
 
   ./_autosetup
 
-  cp -r "$srcdir/$pkgbase" "$srcdir/$pkgbase-nox"
+  cp -r "$srcdir"/${pkgbase}{,-nox}
+
+  # Don't force xss
+  sed -i 's/^  enable_xss="yes"$/  enable_xss="no"/' "$srcdir"/boinc-nox/configure
 }
 
 build() {
@@ -47,7 +50,7 @@ build() {
     CONFIG="--with-boinc-alt-platform=arm-linux-gnueabihf"
   fi
 
-  cd "$srcdir/$pkgbase"
+  cd "$srcdir"/$pkgbase
   LDFLAGS='-lX11' ./configure \
     --prefix=/usr \
     --enable-libraries \
@@ -66,7 +69,7 @@ build() {
   make
 
   # Build boinc-nox
-  cd "$srcdir/$pkgbase-nox"
+  cd "$srcdir"/$pkgbase-nox
   PKG_CONFIG=/usr/bin/pkg-config ./configure \
     --prefix=/usr \
     --enable-libraries \
@@ -75,7 +78,6 @@ build() {
     --enable-dynamic-client-linkage \
     --enable-client \
     --disable-server \
-    --disable-xss \
     --disable-static \
     --disable-manager \
     --with-ssl \