diff --git a/fence-agents.spec b/fence-agents.spec
index 685bbfa..a0ce5c5 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -9,7 +9,7 @@
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.2.1
-Release: 5%{?alphatag:.%{alphatag}}%{?dist}
+Release: 6%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: https://github.com/ClusterLabs/fence-agents
@@ -166,6 +166,7 @@ misbehaving hosts by the means of remote power management, blocking
 network, storage, or similar.
 
 This package serves as a catch-all for all supported fence agents.
+%files all
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package alom
@@ -507,6 +508,22 @@ the SNMP protocol.
 %{_sbindir}/fence_ifmib
 %{_mandir}/man8/fence_ifmib.8*
 
+%package ilo2
+License: GPLv2+ and LGPLv2+
+Group: System Environment/Base
+Summary: Fence agents for HP iLO2 devices
+Requires: gnutls-utils
+Requires: fence-agents-common = %{version}-%{release}
+BuildArch: noarch
+%description ilo2
+Fence agents for HP iLO2 devices that are accessed via
+the HTTP(s) protocol.
+%files ilo2
+%{_sbindir}/fence_ilo
+%{_sbindir}/fence_ilo2
+%{_mandir}/man8/fence_ilo.8*
+%{_mandir}/man8/fence_ilo2.8*
+
 %package ilo-moonshot
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -551,22 +568,6 @@ Fence agents for HP iLO devices that are accessed via telnet or SSH.
 %{_sbindir}/fence_ilo4_ssh
 %{_mandir}/man8/fence_ilo4_ssh.8*
 
-%package ilo2
-License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
-Summary: Fence agents for HP iLO2 devices
-Requires: gnutls-utils
-Requires: fence-agents-common = %{version}-%{release}
-BuildArch: noarch
-%description ilo2
-Fence agents for HP iLO2 devices that are accessed via
-the HTTP(s) protocol.
-%files ilo2
-%{_sbindir}/fence_ilo
-%{_sbindir}/fence_ilo2
-%{_mandir}/man8/fence_ilo.8*
-%{_mandir}/man8/fence_ilo2.8*
-
 %package intelmodular
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -977,6 +978,9 @@ Fence agent for IBM z/VM over IP.
 %{_mandir}/man8/fence_zvmip.8*
 
 %changelog
+* Wed Sep 19 2018 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-6
+- Fix missing fence-agents-all subpackage after spec improvements
+
 * Wed Aug 22 2018 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-5
 - Python 3: fix has_key() issues