diff --git a/corosync.spec b/corosync.spec
index 07f2eba..e1fe0dc 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -10,27 +10,16 @@ URL: http://www.openais.org
 Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz
 Patch0: corosync-trunk.diff
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Runtime bits
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Conflicts: openais <= 0.89, openais-devel <= 0.89
 
+# Setup/build bits
 %define ais_user_uid 39
 
-%description 
-This package contains the Corosync Cluster Engine Executive, several default
-APIs and libraries, default configuration files, and an init script.
-
-%package devel
-Summary: The Corosync Cluster Engine
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-
-%description devel
-This package contains include files and man pages used to develop using
-The Corosync Cluster Engine APIs.
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %prep
 %setup -q -n corosync-%{version}
@@ -56,6 +45,10 @@ install -m 755 init/redhat $RPM_BUILD_ROOT%{_initddir}/corosync
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%description 
+This package contains the Corosync Cluster Engine Executive, several default
+APIs and libraries, default configuration files, and an init script.
+
 %pre
 # Add the "ais" user
 /usr/sbin/useradd -c 'The Corosync Cluster Engine' \
@@ -113,6 +106,16 @@ fi
 %{_mandir}/man8/corosync-objctl.8*
 %{_mandir}/man5/corosync.conf.5*
 
+%package devel
+Summary: The Corosync Cluster Engine
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+This package contains include files and man pages used to develop using
+The Corosync Cluster Engine APIs.
+
 %files devel
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}
@@ -170,6 +173,7 @@ fi
 * Mon Feb  2 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 0.92-7.svn1756
 - Update to svn trunk at revision 1756 from upstream.
 - Add support pkgconfig to devel package.
+- Tidy up spec files by re-organazing sections according to packages.
 
 * Tue Jan 27 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 0.92-6.svn1750
 - Update to svn trunk at revision 1750 from upstream.