Index: cli/src/Makefile.in
--- cli/src/Makefile.in.orig	2018-10-18 16:13:50.613633826 +0200
+++ cli/src/Makefile.in	2018-10-22 08:47:23.211975000 +0200
@@ -107,8 +107,8 @@
 gluster_DEPENDENCIES =  \
 	$(top_builddir)/libglusterfs/src/libglusterfs.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(top_builddir)/rpc/xdr/src/libgfxdr.la \
 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+	$(top_builddir)/rpc/xdr/src/libgfxdr.la \
 	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -412,8 +412,8 @@
 	 cli-cmd-system.c cli-cmd-misc.c cli-xml-output.c cli-quotad-client.c cli-cmd-snapshot.c
 
 gluster_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD) \
-		$(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la \
 		$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+		$(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la \
 		$(XML_LIBS)
 
 gluster_LDFLAGS = $(GF_LDFLAGS)
Index: configure
--- configure.orig	2018-10-18 16:13:48.826629194 +0200
+++ configure	2018-10-22 08:47:23.213891000 +0200
@@ -14465,6 +14465,9 @@
      linux*)
 #do nothing
        ;;
+     freebsd*)
+#do nothing
+       ;;
      netbsd*)
 #do nothing
        ;;
@@ -15562,7 +15565,7 @@
 fi
 
 saved_CFLAGS=$CFLAGS
-CFLAGS="-Wformat -Werror=format-security"
+CFLAGS=""
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Werror=format-security" >&5
 $as_echo_n "checking whether $CC accepts -Werror=format-security... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15592,8 +15595,8 @@
 
 saved_CFLAGS=$CFLAGS
 saved_GF_CFLAGS=$GF_CFLAGS
-CFLAGS="-Werror=implicit-function-declaration"
-GF_CFLAGS="-Werror=implicit-function-declaration"
+CFLAGS=""
+GF_CFLAGS=""
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Werror=implicit-function-declaration" >&5
 $as_echo_n "checking whether $CC accepts -Werror=implicit-function-declaration... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
Index: contrib/fuse-lib/mount.c
--- contrib/fuse-lib/mount.c.orig	2018-10-18 16:13:43.654615787 +0200
+++ contrib/fuse-lib/mount.c	2018-10-22 08:47:23.214051000 +0200
@@ -384,6 +384,7 @@
         build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1);
         build_iovec (&iov, &iovlen, "volname", source, -1);
         build_iovec (&iov, &iovlen, "fd", fdstr, -1);
+        build_iovec (&iov, &iovlen, "allow_other", NULL, -1);
         ret = nmount (iov, iovlen, mountflags);
 #else
         ret = mount (source, mountpoint, fstype, mountflags,
Index: libglusterfs/src/compat-uuid.h
--- libglusterfs/src/compat-uuid.h.orig	2018-10-22 08:47:23.214192000 +0200
+++ libglusterfs/src/compat-uuid.h	2018-10-22 19:39:03.598455000 +0200
@@ -11,7 +11,7 @@
 #ifndef _GF_UUID_H
 #define _GF_UUID_H
 
-#include <uuid/uuid.h>
+#include "uuid.h"
 
 static inline void
 gf_uuid_clear(uuid_t uuid)