diff --git a/bluefish.spec b/bluefish.spec
index 52eadf9..7b2d8bd 100644
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -1,10 +1,10 @@
 %global pkgver 2.2.10
 #global prerel rc1
-%global rpmrel 5
+%global rpmrel 6
 
 Name:		bluefish
 Version:	%{pkgver}
-Release:	%{?prerel:0.}%{rpmrel}%{?prerel:.%{prerel}}%{?dist}.1
+Release:	%{?prerel:0.}%{rpmrel}%{?prerel:.%{prerel}}%{?dist}
 Summary:	Web development application for experienced users
 License:	GPLv3+
 URL:		http://bluefish.openoffice.nl/
@@ -62,7 +62,6 @@ editing dynamic and interactive websites.
 
 %package shared-data
 Summary:	Architecture-independent data for %{name}
-Group:		Development/Tools
 BuildArch:	noarch
 # So that we pull in the binary when someone installs the data (#1091613)
 Requires:	%{name} = %{version}-%{release}
@@ -121,7 +120,7 @@ install -m 644 -p -t %{buildroot}%{bluefish_docdir}/ \
 rm -f %{buildroot}%{_libdir}/%{name}/*.la
 
 %post shared-data
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?fedora} < 26 && 0%{?rhel} < 8
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 touch --no-create %{_datadir}/mime/packages &> /dev/null || :
@@ -133,7 +132,7 @@ xmlcatalog --noout --add 'delegateURI' \
 
 %postun shared-data
 if [ "$1" = 0 ]; then
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?fedora} < 26 && 0%{?rhel} < 8
 	touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 	gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 	update-desktop-database -q &> /dev/null ||:
@@ -145,8 +144,8 @@ if [ "$1" = 0 ]; then
 		%{_sysconfdir}/xml/catalog &> /dev/null || :
 fi
 
+%if 0%{?fedora} < 26 && 0%{?rhel} < 8
 %posttrans shared-data
-%if 0%{?rhel} && 0%{?rhel} <= 7
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
 %endif
@@ -179,6 +178,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon Jan  8 2018 Paul Howarth <paul@city-fan.org> - 2.2.10-6
+- Retain legacy scriptlets for builds on legacy Fedoras
+- Remove a Group: tag that was missed earlier
+
 * Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.2.10-5.1
 - Remove obsolete scriptlets