diff --git a/srcpkgs/boinc/files/boinc/conf b/srcpkgs/boinc/files/boinc/conf
new file mode 100644
index 00000000000..92b577b8583
--- /dev/null
+++ b/srcpkgs/boinc/files/boinc/conf
@@ -0,0 +1,11 @@
+# Read default configuration
+[ -f /etc/default/boinc-client ] && . /etc/default/boinc-client
+# Override with global configuration
+[ -f /etc/boinc-client.conf ] && . /etc/boinc-client.conf
+BOINCEXE_NAME=${BOINCEXE_NAME:-boinc_client}
+BOINCCMD_NAME=${BOINCCMD_NAME:-boinccmd}
+BOINCUSER=${BOINCUSER:-boinc}
+BOINCDIR=${BOINCDIR:-/var/lib/boinc}
+LOGFILE=${LOGFILE:-/var/log/${BOINCEXE_NAME}.log}
+ERRORLOG=${ERRORLOG:-/var/log/${BOINCEXE_NAME}_err.log}
+OPTS=${BOINCOPTS} --dir ${BOINCDIR}
diff --git a/srcpkgs/boinc/files/boinc/run b/srcpkgs/boinc/files/boinc/run
index 1e744a818f8..42d136d4112 100644
--- a/srcpkgs/boinc/files/boinc/run
+++ b/srcpkgs/boinc/files/boinc/run
@@ -1,17 +1,8 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
-# Read default configuration
-[ -f /etc/default/boinc-client ] && . /etc/default/boinc-client
-# Override with global configuration
-[ -f /etc/boinc-client.conf ] && . /etc/boinc-client.conf
-BOINCEXE_NAME=${BOINCEXE_NAME:-boinc_client}
-BOINCCMD_NAME=${BOINCCMD_NAME:-boinccmd}
-BOINCUSER=${BOINCUSER:-boinc}
-BOINCDIR=${BOINCDIR:-/var/lib/boinc}
-LOGFILE=${LOGFILE:-/var/log/${BOINCEXE_NAME}.log}
-ERRORLOG=${ERRORLOG:-/var/log/${BOINCEXE_NAME}_err.log}
-[ ! -d ${BOINCDIR} ] && mkdir -m 755 -p ${BOINCDIR} && chown ${BOINCUSER} ${BOINCDIR}
-[ ! -f ${LOGFILE} ] && touch ${LOGFILE} && chown ${BOINCUSER} ${LOGFILE}
-[ ! -f ${ERRORLOG} ] && touch ${ERRORLOG} && chown ${BOINCUSER} ${ERRORLOG}
+[ -d ${BOINCDIR} ] || mkdir -m 755 -p ${BOINCDIR}
+[ -f ${LOGFILE} ] || touch ${LOGFILE}
+[ -f ${ERRORLOG} ] || touch ${ERRORLOG}
+chown --recursive ${BOINCUSER}:${BOINCUSER} ${BOINCDIR} ${LOGFILE} ${ERRORLOG}
 exec 2>&1
-exec chpst -u ${BOINCUSER} ${BOINCEXE_NAME} ${BOINCOPTS}
+exec chpst -u ${BOINCUSER} ${BOINCEXE_NAME} ${OPTS}
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 9e1e48337e1..6fc1b9bad00 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
-version=7.6.22
-revision=3
+version=7.6.31
+revision=1
 wrksrc=boinc-client_release-${version%.*}-${version}
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python"
@@ -17,7 +17,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0"
 homepage="https://boinc.berkeley.edu/"
 distfiles="https://github.com/BOINC/boinc/archive/client_release/${version%.*}/${version}.tar.gz>boinc-${version}.tar.gz"
-checksum=b5b2b211725bc46399d3504bd6b0b60a9f9506d9f6b5a04d524991f239c16585
+checksum=133490409d4a8513024253dd22ccf6ab26f210226db97f2021fd75eb79a27f08
 conflicts="boinc-nox>=0"
 
 CXXFLAGS="-Wno-redundant-decls"