diff --git a/common/shlibs b/common/shlibs
index fadb2375080..361771560c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1417,10 +1417,12 @@ libgdiplus.so.0 libgdiplus-2.10.9_1
 libmonosgen-2.0.so.1 mono-3.2.3_1
 libshout-idjc.so.3 libshout-idjc-2.3.1_1
 libmonoboehm-2.0.so.1 mono-3.2.3_1
-libglusterfs.so.0 libglusterfs-3.4.1_1
-libgfrpc.so.0 libglusterfs-3.4.1_1
-libgfxdr.so.0 libglusterfs-3.4.1_1
-libgfapi.so.0 libglusterfs-3.4.1_1
+libglusterfs.so.0 libglusterfs-3.8.0_1
+libgfdb.so.0 libglusterfs-3.8.0_1
+libgfchangelog.so.0 libglusterfs-3.8.0_1
+libgfrpc.so.0 libglusterfs-3.8.0_1
+libgfxdr.so.0 libglusterfs-3.8.0_1
+libgfapi.so.0 libglusterfs-3.8.0_1
 libsnapper.so.3 libsnapper-0.2.6_1
 libtsm.so.3 libtsm-3_1
 libxine.so.2 libxine-1.2.4_1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 452257e9e63..1b25320904a 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
-version=3.5.2
-revision=9
+version=3.8.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-glupy --enable-crypt-xlator
  --sbindir=/usr/bin --with-mountutildir=/usr/bin
  ac_cv_file__etc_debian_version=no ac_cv_file__etc_SuSE_release=no
  ac_cv_file__etc_redhat_release=no"
 hostmakedepends="pkg-config python flex automake libtool"
-makedepends="liblvm2app-devel fuse-devel libxml2-devel libfl-devel libressl-devel readline-devel"
+makedepends="liblvm2app-devel fuse-devel libxml2-devel libuuid-devel acl-devel sqlite-devel liburcu-devel libaio-devel libressl-devel readline-devel"
 # python is required by gsyncd.
 depends="python"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
@@ -17,11 +17,13 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2, LGPL-3"
 homepage="http://www.gluster.org/"
 distfiles="http://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz"
-checksum=ef58b467a60fd6bd0685d4167a45f0860895414285b3908167b264aa63d276c3
+checksum=8a2d89a37bf7c99bc153826dbeaf2113a7e45c77bc6978a2850c9033ddd77511
+
+nocross=yes
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) broken="not yet supported";;
+esac
 
-pre_configure() {
-	./autogen.sh
-}
 post_install() {
 	rm -rf ${DESTDIR}/var
 	vsv glusterfsd