diff --git a/glusterfs-3.8.7.configure.ac.patch b/glusterfs-3.8.7.configure.ac.patch
new file mode 100644
index 0000000..a207d2e
--- /dev/null
+++ b/glusterfs-3.8.7.configure.ac.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2017-01-06 15:23:00.285940821 -0500
++++ configure.ac	2017-01-06 15:23:43.169940821 -0500
+@@ -726,7 +726,7 @@
+               [BUILD_FIREWALLD="${enableval}"], [BUILD_FIREWALLD="no"])
+ 
+ if test "x${BUILD_FIREWALLD}" = "xyes"; then
+-        if !(which firewalld 1>/dev/null 2>&1) ; then
++        if !(test -d /usr/lib/firewalld/services 1>/dev/null 2>&1) ; then
+                 BUILD_FIREWALLD="no (firewalld not installed)"
+         fi
+ fi
diff --git a/glusterfs.spec b/glusterfs.spec
index 1e8c8fa..c32ca2d 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -161,7 +161,7 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.8.7
-Release:          1%{?prereltag:.%{prereltag}}%{?dist}
+Release:          2%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
@@ -182,6 +182,7 @@ Source8:          glusterfsd.init
 %else
 Source0:          @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 %endif
+Patch0:           glusterfs-3.8.7.configure.ac.patch
 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -227,7 +228,7 @@ BuildRequires:    libattr-devel
 %endif
 
 %if (0%{?_with_firewalld:1})
-BuildRequires:    firewalld
+BuildRequires:    firewalld-filesystem
 %endif
 
 Obsoletes:        hekafs
@@ -562,6 +563,10 @@ Requires(preun):  /sbin/service
 Requires(preun):  /sbin/chkconfig
 Requires(postun): /sbin/service
 %endif
+%if (0%{?_with_firewalld:1})
+# we install firewalld rules, so we need to have the directory owned
+Requires:         firewalld-filesystem
+%endif
 %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
 Requires:         rpcbind
 %else
@@ -589,6 +594,7 @@ This package provides the glusterfs server daemon.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prereltag}
+%patch0 -p1
 
 %build
 %if ( 0%{?rhel} && 0%{?rhel} < 6 )
@@ -814,11 +820,7 @@ if [ -e /etc/ld.so.conf.d/glusterfs.conf ]; then
 fi
 
 %if (0%{?_with_firewalld:1})
-#reload service files if firewalld running
-if $(systemctl is-active firewalld 1>/dev/null 2>&1); then
-  #firewalld-filesystem is not available for rhel7, so command used for reload.
-  firewall-cmd  --reload 1>/dev/null 2>&1
-fi
+    %firewalld_reload
 %endif
 
 pidof -c -o %PPID -x glusterd &> /dev/null
@@ -889,10 +891,7 @@ exit 0
 %postun server
 /sbin/ldconfig
 %if (0%{?_with_firewalld:1})
-#reload service files if firewalld running
-if $(systemctl is-active firewalld 1>/dev/null 2>&1); then
-    firewall-cmd  --reload
-fi
+    %firewalld_reload
 %endif
 exit 0
 
@@ -1208,6 +1207,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Jan 6 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.8.7-2
+- firewalld fixes
+
 * Tue Dec 13 2016  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.8.7-1
 - 3.8.7 GA