diff --git a/bacula.spec b/bacula.spec
index c2903a5..9db7a87 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -68,6 +68,49 @@ storage management features that make it easy to find and recover lost
 or damaged files.
 
 
+%package common
+Summary:		Common Bacula utilities
+Group:			System Environment/Daemons
+Requires(pre):		fedora-usermgmt
+Obsoletes:		bacula-console-gnome <= 2.4, bacula-traymonitor <= 2.4
+Obsoletes:		bacula-sysconfdir <= 2.4, bacula-console-wxwidgets <= 5.0.3
+
+%description common
+Bacula is a set of programs that allow you to manage the backup,
+recovery, and verification of computer data across a network of
+different computers. It is based on a client/server architecture.
+
+
+%package director-common
+Summary:		Common Bacula Director files
+Group:			System Environment/Daemons
+Requires:		bacula-director = %{version}-%{release}
+Requires:		bacula-common%{?_isa} = %{version}-%{release}
+Requires:		logwatch
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+Requires(post):		systemd-sysv
+Requires(post):		systemd-units
+Requires(preun):	systemd-units
+Requires(postun):	systemd-units
+%else
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/chkconfig
+Requires(preun):	/sbin/service
+Requires(postun):	/sbin/service
+%endif
+
+%description director-common
+Bacula is a set of programs that allow you to manage the backup,
+recovery, and verification of computer data across a network of
+different computers. It is based on a client/server architecture.
+
+This package contains the common director files, which are shared 
+between all database back-ends. You have to select a possible
+database back-end though, which provides the needed bacula-director
+dependency. Please choose from bacula-director-mysql,
+bacula-director-sqlite or bacula-director-postgresql.
+
+
 %package director-mysql
 Summary:		Bacula Director with MySQL database support
 Group:			System Environment/Daemons
@@ -119,61 +162,6 @@ your backup run.
 This director has support for the PostgresSQL database.
 
 
-%package director-common
-Summary:		Common Bacula Director files
-Group:			System Environment/Daemons
-Requires:		bacula-director = %{version}-%{release}
-Requires:		bacula-common%{?_isa} = %{version}-%{release}
-Requires:		logwatch
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
-Requires(post):		systemd-sysv
-Requires(post):		systemd-units
-Requires(preun):	systemd-units
-Requires(postun):	systemd-units
-%else
-Requires(post):		/sbin/chkconfig
-Requires(preun):	/sbin/chkconfig
-Requires(preun):	/sbin/service
-Requires(postun):	/sbin/service
-%endif
-
-%description director-common
-Bacula is a set of programs that allow you to manage the backup,
-recovery, and verification of computer data across a network of
-different computers. It is based on a client/server architecture.
-
-This package contains the common director files, which are shared 
-between all database back-ends. You have to select a possible
-database back-end though, which provides the needed bacula-director
-dependency. Please choose from bacula-director-mysql,
-bacula-director-sqlite or bacula-director-postgresql.
-
-
-%package client
-Summary:		Bacula backup client
-Group:			System Environment/Daemons
-Requires:		bacula-common%{?_isa} = %{version}-%{release}
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
-Requires(post):		systemd-sysv
-Requires(post):		systemd-units
-Requires(preun):	systemd-units
-Requires(postun):	systemd-units
-%else
-Requires(post):		/sbin/chkconfig
-Requires(preun):	/sbin/chkconfig
-Requires(preun):	/sbin/service
-Requires(postun):	/sbin/service
-%endif
-
-%description client
-Bacula is a set of programs that allow you to manage the backup,
-recovery, and verification of computer data across a network of
-different computers. It is based on a client/server architecture.
-
-This package contains the bacula client, the daemon running on the 
-system to be backed up.
-
-
 %package storage
 Summary:		Bacula storage daemon files
 Group:			System Environment/Daemons
@@ -209,18 +197,30 @@ writing the data received from the clients onto tape drives or other
 mass storage devices.
 
 
-%package common
-Summary:		Common Bacula utilities
+%package client
+Summary:		Bacula backup client
 Group:			System Environment/Daemons
-Requires(pre):		fedora-usermgmt
-Obsoletes:		bacula-console-gnome <= 2.4, bacula-traymonitor <= 2.4
-Obsoletes:		bacula-sysconfdir <= 2.4, bacula-console-wxwidgets <= 5.0.3
+Requires:		bacula-common%{?_isa} = %{version}-%{release}
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+Requires(post):		systemd-sysv
+Requires(post):		systemd-units
+Requires(preun):	systemd-units
+Requires(postun):	systemd-units
+%else
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/chkconfig
+Requires(preun):	/sbin/service
+Requires(postun):	/sbin/service
+%endif
 
-%description common
+%description client
 Bacula is a set of programs that allow you to manage the backup,
 recovery, and verification of computer data across a network of
 different computers. It is based on a client/server architecture.
 
+This package contains the bacula client, the daemon running on the 
+system to be backed up.
+
 
 %package console
 Summary:		Bacula management console
@@ -671,38 +671,6 @@ fi
 %dir %attr(750, bacula, bacula) %{_localstatedir}/spool/bacula
 %{_sbindir}/bacula-checkconf
 
-%files client
-%defattr(-,root,root,-)
-%{_sbindir}/bacula-fd
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
-%{_unitdir}/bacula-fd.service
-%else
-%{_initrddir}/bacula-fd
-%endif
-%config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
-%{_mandir}/man8/bacula-fd.8.gz
-%{_libdir}/bacula/bpipe-fd.so
-
-%files console
-%defattr(-,root,root,-)
-%{_sbindir}/bconsole
-%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf
-%{_mandir}/man8/bconsole.8.gz
-
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%files console-bat
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/security/console.apps/bat
-%config(noreplace) %{_sysconfdir}/pam.d/bat
-%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
-%{_bindir}/bat
-%{_sbindir}/bat
-%{_mandir}/man1/bat.1.gz
-%{_datadir}/applications/fedora-bacula-bat.desktop
-%{_datadir}/pixmaps/bat_icon.png
-%endif
-
 %files director-common
 %defattr(-,root,root,-)
 %doc updatedb
@@ -800,6 +768,38 @@ fi
 %{_mandir}/man8/bls.8.gz
 %{_mandir}/man8/btape.8.gz
 
+%files client
+%defattr(-,root,root,-)
+%{_sbindir}/bacula-fd
+%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%{_unitdir}/bacula-fd.service
+%else
+%{_initrddir}/bacula-fd
+%endif
+%config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
+%{_mandir}/man8/bacula-fd.8.gz
+%{_libdir}/bacula/bpipe-fd.so
+
+%files console
+%defattr(-,root,root,-)
+%{_sbindir}/bconsole
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf
+%{_mandir}/man8/bconsole.8.gz
+
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%files console-bat
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/security/console.apps/bat
+%config(noreplace) %{_sysconfdir}/pam.d/bat
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
+%{_bindir}/bat
+%{_sbindir}/bat
+%{_mandir}/man1/bat.1.gz
+%{_datadir}/applications/fedora-bacula-bat.desktop
+%{_datadir}/pixmaps/bat_icon.png
+%endif
+
 %files docs
 %defattr(-,root,root,-)
 %doc bacula-docs-%{version}/manuals/en/problems/problems.pdf