diff --git a/qemu.changes b/qemu.changes
index 7b085a0e..d5fb14ae 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Oct 13 10:57:49 UTC 2017 - henrik.kuhn@origenis.de
+
+- Added the global macro 'with_glusterfs' in order to re-enable
+  glusterfs support. The macro enable easier future adjustments
+  for various ARCH/targets/requiremnets.
+  At first glusterfs support is enabled for openSUSE Leap 42.x and
+  Factory for ARCH x86_64.
+
 -------------------------------------------------------------------
 Wed Oct  4 16:21:04 UTC 2017 - brogers@suse.com
 
diff --git a/qemu.spec b/qemu.spec
index 4bee14c9..3773af06 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -63,6 +63,9 @@
 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && ( 0%{?is_opensuse} == 0 || 0%{?sle_version} > 120100 ) )
 %define with_rbd 1
 %endif
+%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} )
+%define with_glusterfs 1
+%endif
 %endif
 
 %ifarch aarch64
@@ -227,7 +230,7 @@ BuildRequires:  gcc6
 %endif
 %endif
 BuildRequires:  glib2-devel
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 BuildRequires:  glusterfs-devel
 %endif
 %if 0%{?suse_version} >= 1220
@@ -367,7 +370,7 @@ BuildRequires:  qemu-ppc   = %version
 BuildRequires:  qemu-s390  = %version
 BuildRequires:  qemu-tools = %version
 BuildRequires:  qemu-x86   = %version
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 BuildRequires:  qemu-block-gluster = %version
 %endif
 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
@@ -413,7 +416,7 @@ Recommends:     qemu-arm
 Suggests:       qemu-arm
 %endif
 Suggests:       qemu-block-dmg
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 Suggests:       qemu-block-gluster
 %endif
 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
@@ -647,7 +650,7 @@ as PC and PowerMac systems.
 This sub-package contains a module for accessing Mac OS X image files
 from qemu-img tool and QEMU system emulation.
 
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 %package block-gluster
 Summary:        Universal CPU emulator -- GlusterFS block support
 Group:          System/Emulators/PC
@@ -927,7 +930,7 @@ echo '%{version}' > roms/seabios/.version
 	--enable-gcrypt \
 	--disable-nettle \
 %endif
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 	--enable-glusterfs \
 %else
 	--disable-glusterfs \
@@ -1509,7 +1512,7 @@ fi
 %dir %_libdir/%name
 %_libdir/%name/block-dmg-bz2.so
 
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 %files block-gluster
 %defattr(-, root, root)
 %dir %_libdir/%name
diff --git a/qemu.spec.in b/qemu.spec.in
index 76c9ad7a..5cc97bba 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -63,6 +63,9 @@
 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && ( 0%{?is_opensuse} == 0 || 0%{?sle_version} > 120100 ) )
 %define with_rbd 1
 %endif
+%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} )
+%define with_glusterfs 1
+%endif
 %endif
 
 %ifarch aarch64
@@ -189,7 +192,7 @@ BuildRequires:  gcc6
 %endif
 %endif
 BuildRequires:  glib2-devel
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 BuildRequires:  glusterfs-devel
 %endif
 %if 0%{?suse_version} >= 1220
@@ -329,7 +332,7 @@ BuildRequires:  qemu-ppc   = %version
 BuildRequires:  qemu-s390  = %version
 BuildRequires:  qemu-tools = %version
 BuildRequires:  qemu-x86   = %version
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 BuildRequires:  qemu-block-gluster = %version
 %endif
 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
@@ -375,7 +378,7 @@ Recommends:     qemu-arm
 Suggests:       qemu-arm
 %endif
 Suggests:       qemu-block-dmg
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 Suggests:       qemu-block-gluster
 %endif
 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
@@ -609,7 +612,7 @@ as PC and PowerMac systems.
 This sub-package contains a module for accessing Mac OS X image files
 from qemu-img tool and QEMU system emulation.
 
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 %package block-gluster
 Summary:        Universal CPU emulator -- GlusterFS block support
 Group:          System/Emulators/PC
@@ -851,7 +854,7 @@ echo '%{version}' > roms/seabios/.version
 	--enable-gcrypt \
 	--disable-nettle \
 %endif
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 	--enable-glusterfs \
 %else
 	--disable-glusterfs \
@@ -1433,7 +1436,7 @@ fi
 %dir %_libdir/%name
 %_libdir/%name/block-dmg-bz2.so
 
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
+%if 0%{?with_glusterfs}
 %files block-gluster
 %defattr(-, root, root)
 %dir %_libdir/%name