diff --git a/mozilla-https-everywhere.spec b/mozilla-https-everywhere.spec
index 10f51a1..c94a038 100644
--- a/mozilla-https-everywhere.spec
+++ b/mozilla-https-everywhere.spec
@@ -17,10 +17,9 @@ License:        GPLv2+
 URL:            https://eff.org/https-everywhere
 # A git repo is available at git://git.torproject.org/https-everywhere.git
 Source0:        https://www.eff.org/files/https-everywhere-%{version}.xpi
-%if 0%{?rhel}
-%else
 Source1:        mozilla-https-everywhere.metainfo.xml
-%endif
+# Makes extension not auto-update from Mozilla's updater
+# Not submitted to upstream, but they are aware we use it
 Patch0:         appManaged.patch
 
 
@@ -31,7 +30,9 @@ BuildRequires:  dos2unix
 Requires:       firefox >= 3.5
 %else
 Requires:       mozilla-filesystem
-# GNOME Software Center not present on EL systems
+%endif
+# GNOME Software Center not present on EL systems and Fedora < 21
+%if 0%{?fedora} >= 21
 BuildRequires:  libappstream-glib
 %endif
 BuildArch:      noarch
@@ -74,10 +75,9 @@ mkdir -p %{buildroot}%{seamonkey_inst_dir}
 ln -s %{firefox_inst_dir} %{buildroot}%{seamonkey_inst_dir}
 
 
-# if not RHEL
-# install MetaInfo file for firefox
-%if 0%{?rhel}
-%else
+# if Fedora >= 21
+# install MetaInfo file for firefox, etc
+%if 0%{?fedora} >= 21
 DESTDIR=%{buildroot} appstream-util install %{SOURCE1}
 %endif
 
@@ -90,8 +90,9 @@ rm -rf %{buildroot}
 # doc LICENSE.txt
 %{firefox_inst_dir}
 %{seamonkey_inst_dir}
-%if 0%{?rhel}
-%else
+
+# GNOME Software Center metadata
+%if 0%{?fedora} >= 21
 %{_datadir}/appdata/*.metainfo.xml
 %endif
 
@@ -102,6 +103,8 @@ rm -rf %{buildroot}
 - Merge Android Firefox branch, so Android now has the same release cycle
  -- as the stable HTTPS Everywhere branch for Firefox.
 - Remove old unused ContentPolicy code.
+- FEDORA/RHEL SPECIFIC - Place version conditionals for GNOME Software
+ -- Center metadata in spec file.
 
 * Tue Aug 19 2014 Richard Hughes <richard@hughsie.com> - 3.5.3-2
 - Add a MetaInfo file for GNOME Software and Apper.