diff --git a/srcpkgs/glusterfs/files/glusterd.service b/srcpkgs/glusterfs/files/glusterd.service
deleted file mode 100644
index c6e63170984..00000000000
--- a/srcpkgs/glusterfs/files/glusterd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Distributed filesystem daemon
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/glusterd.pid
-LimitNOFILE=65536
-ExecStart=/usr/bin/glusterd -p /run/glusterd.pid 
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/glusterfs/files/glusterd/run b/srcpkgs/glusterfs/files/glusterd/run
new file mode 100644
index 00000000000..7f0e6820e66
--- /dev/null
+++ b/srcpkgs/glusterfs/files/glusterd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec glusterd -N 2>&1
diff --git a/srcpkgs/glusterfs/files/glusterfsd/run b/srcpkgs/glusterfs/files/glusterfsd/run
new file mode 100644
index 00000000000..15dd0bed446
--- /dev/null
+++ b/srcpkgs/glusterfs/files/glusterfsd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec glusterfsd -N 2>&1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 095c3e5e594..c7f5c3ff398 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,36 +1,52 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
-version=3.5.1
+version=3.5.2
 revision=1
+build_options="systemd"
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --with-mountutildir=/usr/bin
+configure_args="--disable-glupy --enable-crypt-xlator
+ --sbindir=/usr/sbin --with-mountutildir=/usr/sbin
  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="fuse-devel libxml2-devel libfl-devel libressl-devel readline-devel>=6.3 python"
+makedepends="liblvm2app-devel fuse-devel libxml2-devel libfl-devel libressl-devel readline-devel>=6.3"
 # python is required by gsyncd.
 depends="python"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
-systemd_services="glusterd.service on"
-conf_files="
-	/etc/glusterfs/glusterfs-logrotate
-	/etc/glusterfs/glusterd.vol"
-short_desc="Distributed file system capable of scaling to several petabytes"
+short_desc="A distributed userland file system - client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 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=eeff8399a1b83fc57f79bacccee8360845785bc67f1683bdbaff8d0493f5377b
+checksum=ef58b467a60fd6bd0685d4167a45f0860895414285b3908167b264aa63d276c3
 
 pre_configure() {
-	autoreconf -fi
+	./autogen.sh
 }
-
 post_install() {
-	vinstall ${FILESDIR}/glusterd.service 644 usr/lib/systemd/system
 	rm -rf ${DESTDIR}/var
+	if [ "$build_option_systemd" ]; then
+		vinstall ${wrksrc}/extras/systemd/glusterd.service 644 usr/lib/systemd/system
+	fi
+	vsv glusterfsd
 }
 
+glusterfs-server_package() {
+	short_desc="A distributed userland file system - server"
+	depends="glusterfs-${version}_${revision}"
+	conf_files="
+		/etc/glusterfs/glusterfs-logrotate
+		/etc/glusterfs/glusterd.vol"
+	pkg_install() {
+		vmove etc/glusterfs
+		vmove usr/sbin/glfsheal
+		vmove usr/sbin/gluster
+		vmove usr/sbin/glusterd
+		vmove usr/share/man/man8/gluster.8
+		vmove usr/share/man/man8/glusterd.8
+		vsv glusterd
+	}
+}
 glusterfs-devel_package() {
 	short_desc+=" - development files"
 	depends="libglusterfs>=${version}_${revision}"
@@ -40,7 +56,6 @@ glusterfs-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
 libglusterfs_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {