diff --git a/bacula.spec b/bacula.spec
index 78c57d8..20c4923 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -9,7 +9,7 @@ Summary:                Cross platform network backup for Linux, Unix, Mac and W
 License:                AGPLv3 with exceptions
 Group:                  System Environment/Daemons
 URL:                    http://www.bacula.org
-BuildRoot:              %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:              %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Source0:                http://www.bacula.org/downloads/Bacula-%{version}/%{name}-%{version}.tar.gz
 Source5:                README.Fedora
@@ -69,12 +69,11 @@ BuildRequires:          systemd-units
 %endif
 
 %description
-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 and is
-efficient and relatively easy to use, while offering many advanced
-storage management features that make it easy to find and recover lost
-or damaged files.
+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 and is efficient and relatively easy to
+use, while offering many advanced storage management features that make it easy
+to find and recover lost or damaged files.
 
 
 %package libs
@@ -102,13 +101,13 @@ Provides:               bacula-libs-sqlite = %{version}-%{release}
 Provides:               bacula-libs-postgresql = %{version}-%{release}
 
 %description libs-sql
-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.
+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 SQL Bacula libraries, which are used by 
-Director and Storage daemons. You have to select your preferred catalog
-library through the alternatives system.
+This package contains the SQL Bacula libraries, which are used by Director and
+Storage daemons. You have to select your preferred catalog library through the
+alternatives system.
 
 
 %package common
@@ -121,9 +120,9 @@ Requires(pre):          shadow-utils
 Requires(postun):       shadow-utils
 
 %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.
+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 files common to all Bacula daemons.
 
@@ -155,9 +154,9 @@ Requires(postun):       /sbin/service
 %endif
 
 %description director
-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.
+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 director files.
 
@@ -188,13 +187,13 @@ Requires(postun):       /sbin/service
 %endif
 
 %description storage
-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.
+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 storage daemon, the daemon responsible for 
-writing the data received from the clients onto tape drives or other 
-mass storage devices.
+This package contains the storage daemon, the daemon responsible for writing
+the data received from the clients onto tape drives or other mass storage
+devices.
 
 
 %package client
@@ -214,12 +213,12 @@ 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.
+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.
+This package contains the bacula client, the daemon running on the system to be
+backed up.
 
 
 %package console
@@ -230,12 +229,12 @@ Obsoletes:              bacula-console-wxwidgets <= 5.0.3
 
 
 %description console
-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.
+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 command-line management console for the bacula 
-backup system.
+This package contains the command-line management console for the bacula backup
+system.
 
 
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
@@ -244,9 +243,9 @@ Summary:                Bacula bat console
 Group:                  System Environment/Daemons
 
 %description console-bat
-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.
+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 bat version of the bacula management console.
 
@@ -256,12 +255,12 @@ Summary:                Bacula system tray monitor
 Group:                  System Environment/Daemons
 
 %description traymonitor
-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.
+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 Gnome and KDE compatible tray monitor to 
-monitor your bacula server.
+This package contains the Gnome and KDE compatible tray monitor to monitor your
+bacula server.
 %endif
 
 
@@ -270,9 +269,9 @@ Summary:                Bacula development files
 Group:                  Development/Libraries
 
 %description devel
-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.
+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 development package contains static libraries and header files.