diff --git a/common/shlibs b/common/shlibs
index 3dfc3f5cddd..fda9758e7a5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1431,3 +1431,7 @@ libmonosgen-2.0.so.1 mono-3.2.3_1
 libshout-idjc.so.3 libshout-idjc-2.3.1_1
 libpolarssl.so.5 libpolarssl-1.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
diff --git a/srcpkgs/glusterfs-devel b/srcpkgs/glusterfs-devel
new file mode 120000
index 00000000000..d946aba1d37
--- /dev/null
+++ b/srcpkgs/glusterfs-devel
@@ -0,0 +1 @@
+glusterfs
\ No newline at end of file
diff --git a/srcpkgs/glusterfs/files/glusterd.service b/srcpkgs/glusterfs/files/glusterd.service
new file mode 100644
index 00000000000..c6e63170984
--- /dev/null
+++ b/srcpkgs/glusterfs/files/glusterd.service
@@ -0,0 +1,12 @@
+[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/template b/srcpkgs/glusterfs/template
new file mode 100644
index 00000000000..864022c7cc4
--- /dev/null
+++ b/srcpkgs/glusterfs/template
@@ -0,0 +1,55 @@
+# Template file for 'glusterfs'
+pkgname=glusterfs
+version=3.4.1
+revision=1
+build_style=gnu-configure
+configure_args="--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="fuse-devel libxml2-devel libfl-devel openssl-devel readline-devel python"
+short_desc="Distributed file system capable of scaling to several petabytes"
+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=b5f1b4e3c6b86ecdfc5ff1b870ae3d3384bb2e3943565d6907c29ee6e21ab739
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	vinstall ${FILESDIR}/glusterd.service 644 usr/lib/systemd/system
+	rm -rf ${DESTDIR}/var
+}
+
+glusterfs-devel_package() {
+	short_desc+=" - development files"
+	depends="libglusterfs>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
+
+libglusterfs_package() {
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+glusterfs_package() {
+	# 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"
+	pkg_install() {
+		vmove all
+	}
+}
diff --git a/srcpkgs/libglusterfs b/srcpkgs/libglusterfs
new file mode 120000
index 00000000000..d946aba1d37
--- /dev/null
+++ b/srcpkgs/libglusterfs
@@ -0,0 +1 @@
+glusterfs
\ No newline at end of file