diff --git a/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch b/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch
deleted file mode 100644
index c2229f1..0000000
--- a/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a0a0afc59bb1d2deddfdb776bc9e49e02f58ce32 Mon Sep 17 00:00:00 2001
-From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
-Date: Tue, 24 Jul 2018 14:40:51 -0400
-Subject: [PATCH] georep: fix hard-coded paths in gsyncd.conf.in
-
-Why anyone puts a hard-coded path like /usr/local/sbin in a
-config file is beyond me.
-
-I wonder how many more are lurking in our sources
-
-Change-Id: I6523894416cc06236ea1f99529efd36e957bd98e
-updates: bz#1193929
-Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
----
- geo-replication/gsyncd.conf.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo-replication/gsyncd.conf.in b/geo-replication/gsyncd.conf.in
-index 0a842cf2b..bd04400ff 100644
---- a/geo-replication/gsyncd.conf.in
-+++ b/geo-replication/gsyncd.conf.in
-@@ -138,11 +138,11 @@ value =
- help=If SSH keys are not secured with gsyncd prefix then use this configuration to set the actual path of gsyncd(Usually /usr/libexec/glusterfs/gsyncd)
- 
- [gluster-command-dir]
--value=/usr/local/sbin/
-+value=@SBIN_DIR@
- help=Directory where Gluster binaries exist on master
- 
- [slave-gluster-command-dir]
--value=/usr/local/sbin/
-+value=@SBIN_DIR@
- help=Directory where Gluster binaries exist on slave
- 
- [gluster-params]
--- 
-2.17.1
-
diff --git a/glusterfs.spec b/glusterfs.spec
index 2019fdc..9597a3e 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -83,6 +83,11 @@
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
 %{?_without_rdma:%global _without_rdma --disable-ibverbs}
 
+# No RDMA Support on s390(x)
+%ifarch s390 s390x armv7hl
+%global _without_rdma --disable-ibverbs
+%endif
+
 # server
 # if you wish to build rpms without server components, compile like this
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without server
@@ -217,7 +222,7 @@
 Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
-Version:          4.1.4
+Version:          4.1.8
 Release:          %{?prereltag:1.}1%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
@@ -229,7 +234,6 @@ URL:              http://docs.gluster.org/
 %if ( 0%{_for_fedora_koji_builds} )
 Source0:          http://download.gluster.org/pub/gluster/%{name}/4.1/%{version}%{?prereltag}/%{name}-%{version}%{?prereltag}.tar.gz
 Patch0:           python.patch
-Patch1:           0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch
 Source1:          glusterd.sysconfig
 Source2:          glusterfsd.sysconfig
 Source6:          rhel5-load-fuse-modules
@@ -691,7 +695,6 @@ This package provides the glusterfs server daemon.
 %prep
 %setup -q -n %{name}-%{version}%{?prereltag}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %if ( 0%{?rhel} && 0%{?rhel} < 6 )
@@ -1331,7 +1334,9 @@ exit 0
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage
+%if ( 0%{!?_without_bd:1} )
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/bd.so
+%endif
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so
@@ -1444,6 +1449,21 @@ exit 0
 %endif
 
 %changelog
+* Thu Mar 28 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.8-1
+- 4.1.8 GA
+
+* Fri Mar 1 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.7-3
+- 4.1.7 s390x, armv7hl no rdma
+
+* Thu Jan 17 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.7-2
+- 4.1.7 GA
+
+* Wed Nov 14 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.6-1
+- 4.1.6 GA
+
+* Fri Sep 21 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.5-1
+- 4.1.5 GA
+
 * Thu Sep 6 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.4-1
 - 4.1.4 GA
 
@@ -1456,14 +1476,11 @@ exit 0
 * Mon Aug 27 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.3-1
 - 4.1.3 GA
 
-* Wed Jul 25 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.2-3
+* Wed Jul 25 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.2-2
 - 4.1.2, again
 
-* Tue Jul 24 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.2-2
-- 4.1.2, gsyncd.conf /usr/local/sbin 
-
 * Tue Jul 24 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.2-1
-- 4.1.2 GA
+- 4.1.2 GA (includes gsyncd.conf)
 
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 568f205..0e79e2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-4.1.4.tar.gz) = 7ef82170c9025ea74867382acc17e4fde55af82d4b04138fb74800c3fc28f018f9ec493069fd14961310dece6cb386973fb07e00d5cad59a9aaf6020155cba56
+SHA512 (glusterfs-4.1.8.tar.gz) = 950cd2fd774e3eb00f1ec06d54566736b6fbe8d1aed54477a19d9b2727eff8a70ef7ac32815cc7e01d45b5d357fc01af786e16c451f6ad314d472e61ba04ce85