diff --git a/glusterfs.spec b/glusterfs.spec
index 9b26e4e..aed0071 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -59,12 +59,7 @@
 # gnfs
 # if you wish to compile an rpm with the legacy gNFS server xlator
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with gnfs
-%{?_with_gnfs:%global _with_gnfs --enable-gnfs}
-
-# gnfs subpackages for glusterfs-5, will be obsoleted in glusterfs-6
-%if ( 0%{_for_fedora_koji_builds} )
-%global _with_gnfs --enable-gnfs
-%endif
+%{?_without_gnfs:%global _with_gnfs --disable-gnfs}
 
 # ipv6default
 # if you wish to compile an rpm with IPv6 default...
@@ -1399,7 +1394,10 @@ exit 0
 %endif
 
 %changelog
-* Mon Sep 16 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.0-0.1rc1
+* Mon Sep 16 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- disable gnfs by default
+
+* Mon Sep 16 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.0-0.3rc1
 - 7.0 RC1
 
 * Wed Aug 28 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.0-0.2rc0