diff --git a/gprbuild.spec b/gprbuild.spec
index 94be3e6..606faec 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -109,6 +109,10 @@ well-suited for compiled languages.
 %description %{common_description_en}
 
 
+#################
+## Subpackages ##
+#################
+
 %ifnarch %{bootstrap_arch}
 
 %package doc
@@ -156,6 +160,11 @@ applications that use the GNAT project manager library.
 This is not the libgpr that is part of gRPC from Google.
 %endif
 
+
+#############
+## Prepare ##
+#############
+
 %prep
 %autosetup -p1
 
@@ -171,6 +180,11 @@ sed --in-place \
     --expression='43 { s,Gnatpro,GPL,                       ; t; q1 }' \
     gpr/src/gpr-version.ads
 
+
+###########
+## Build ##
+###########
+
 %build
 %ifarch %{bootstrap_arch}
 
@@ -215,6 +229,10 @@ make -C doc html txt info
 %endif
 
 
+#############
+## Install ##
+#############
+
 %install
 %{?filter_setup:
 %filter_requires_in %{_libdir}
@@ -281,7 +299,6 @@ sed --regexp-extended --in-place \
 #    Directories.Libdir.
 
 %endif
-%endif
 
 # Install the Info version of the manual where Info files belong.
 mv --no-target-directory %{buildroot}%{_pkgdocdir}/info %{buildroot}%{_infodir}
@@ -290,6 +307,13 @@ mv --no-target-directory %{buildroot}%{_pkgdocdir}/info %{buildroot}%{_infodir}
 mv %{buildroot}%{_datadir}/examples/%{name} %{buildroot}%{_pkgdocdir}/examples
 rmdir %{buildroot}%{_datadir}/examples
 
+%endif
+
+
+###########
+## Check ##
+###########
+
 %ifarch %{bootstrap_arch}
 %check
 
@@ -305,6 +329,11 @@ gprbuild -v --db /usr/share/gprconfig -P gprbuild-tests/tests_shared.gpr
 
 %endif
 
+
+###########
+## Files ##
+###########
+
 %files
 %license COPYING3 COPYING.RUNTIME
 %doc README*
@@ -339,6 +368,11 @@ gprbuild -v --db /usr/share/gprconfig -P gprbuild-tests/tests_shared.gpr
 %exclude %{_pkgdocdir}/html/objects.inv
 %endif
 
+
+###############
+## Changelog ##
+###############
+
 %changelog
 * Sun Feb 12 2023 Dennis van Raaij <dvraaij@fedoraproject.org> - 2:22.0.0-1
 - Updated to v22.0.0, using the archive available on GitHub.
@@ -379,6 +413,7 @@ gprbuild -v --db /usr/share/gprconfig -P gprbuild-tests/tests_shared.gpr
 - Removed GNAT version requirement; all versions supported by Fedora are more recent.
 - Made the generated usage project file architecture-independent.
 - Updated some summaries and descriptions.
+- Improved spec file readability.
 
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2020-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild