diff --git a/tor.spec b/tor.spec
index 42ca933..f7e3376 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,29 +1,27 @@
 %define runuser toruser
 
+Summary:	Anonymizing overlay network for TCP (The onion router)
 Name:		tor
 Version:	0.2.7.6
 Release:	1
-Summary:	Anonymizing overlay network for TCP (The onion router)
-URL:		http://www.torproject.org/
-Group:		Networking/Other
 License:	BSD-like
-Requires(post):	systemd
-Requires(post):	rpm-helper
-Requires(preun):	rpm-helper
-Requires:	openssl >= 0.9.6
-Requires:	tsocks
-Requires: vidalia
-BuildRequires:	openssl-devel >= 0.9.6 
-BuildRequires:	libevent-devel
-BuildRequires:	zlib-devel
-BuildRequires:	autoconf2.5
-#BuildRequires:	transfig, tetex-latex
-BuildRequires:	ghostscript
+Group:		Networking/Other
+Url:		http://www.torproject.org/
 Source0:	http://www.torproject.org/dist/%{name}-%{version}.tar.gz
 Source1:	%{name}.logrotate
 Source3: 	%{name}.sysconfig
 Source4:	%{name}.service
 Source5:	%{name}-tmpfiles.conf
+BuildRequires:	autoconf2.5
+BuildRequires:	ghostscript
+BuildRequires:	pkgconfig(libevent)
+BuildRequires:	pkgconfig(openssl)
+BuildRequires:	pkgconfig(zlib)
+Requires:	openssl
+Requires:	tsocks
+Requires:	vidalia
+Requires(pre,post,preun,postun):	rpm-helper
+Requires(post):	systemd
 
 %description
 Tor is a connection-based low-latency anonymous communication system.
@@ -47,38 +45,24 @@ bugs. The present network is very small -- this further reduces the
 strength of the anonymity provided. Tor is not presently suitable
 for high-stakes anonymity.
 
-
-%prep
-%setup -q
- 
-%build
-%configure2_5x
-%make
-
-%install
-%makeinstall
-
-%define _logdir %{_var}/log
-
-install -p -m 644 %{buildroot}%{_sysconfdir}/%{name}/torrc.sample %{buildroot}%{_sysconfdir}/%{name}/torrc
-
-mkdir -p -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
-cat %{SOURCE1} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-
-mkdir -p -m 755 %{buildroot}%{_sysconfdir}/sysconfig/
-cat %{SOURCE3} > %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-
-mkdir -p -m 700 %{buildroot}%{_localstatedir}/lib/%{name}
-mkdir -p -m 755 %{buildroot}%{_var}/%{name}
-mkdir -p -m 755 %{buildroot}%{_logdir}/%{name}
-
-# Bash completion
-mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
-echo 'complete -F _command $filenames torify' > %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
-
-# Systemd support
-install -D -p -m 0644 %SOURCE4 %{buildroot}%_unitdir/%name.service
-install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+%files
+%doc ReleaseNotes INSTALL LICENSE README ChangeLog doc/HACKING
+%{_mandir}/man*/*
+%{_bindir}/tor
+%{_bindir}/torify
+%{_bindir}/tor-resolve
+%{_bindir}/tor-gencert
+%{_unitdir}/%{name}.service
+%{_tmpfilesdir}/%{name}.conf
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}
+%dir %attr(0755,root,%{runuser}) %{_sysconfdir}/%{name}/
+%config(noreplace) %attr(0644,root,%{runuser}) %{_sysconfdir}/%{name}/*
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%attr(0700,%{runuser},%{runuser}) %dir %{_localstatedir}/lib/%{name}
+%attr(0750,%{runuser},%{runuser}) %dir %{_var}/%{name}
+%attr(0750,%{runuser},%{runuser}) %dir %{_var}/log/%{name}
+%{_sysconfdir}/bash_completion.d/%{name}
+%{_datadir}/%{name}
 
 %pre
 %_pre_useradd %{runuser} / /bin/false
@@ -99,21 +83,35 @@ rm -f %{_localstatedir}/%{name}/fingerprint
 %_postun_userdel %{runuser}
 %_postun_groupdel %{runuser}
 
-%files
-%doc ReleaseNotes INSTALL LICENSE README ChangeLog doc/HACKING
-%{_mandir}/man*/*
-%{_bindir}/tor
-%{_bindir}/torify
-%{_bindir}/tor-resolve
-%{_bindir}/tor-gencert
-%_unitdir/%name.service
-%{_tmpfilesdir}/%{name}.conf
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}
-%dir %attr(0755,root,%{runuser}) %{_sysconfdir}/%{name}/
-%config(noreplace) %attr(0644,root,%{runuser}) %{_sysconfdir}/%{name}/*
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%attr(0700,%{runuser},%{runuser}) %dir %{_localstatedir}/lib/%{name}
-%attr(0750,%{runuser},%{runuser}) %dir %{_var}/%{name}
-%attr(0750,%{runuser},%{runuser}) %dir %{_logdir}/%{name}
-%{_sysconfdir}/bash_completion.d/%{name}
-%{_datadir}/%{name}
+#----------------------------------------------------------------------------
+
+%prep
+%setup -q
+
+%build
+%configure2_5x
+%make
+
+%install
+%makeinstall
+
+install -p -m 644 %{buildroot}%{_sysconfdir}/%{name}/torrc.sample %{buildroot}%{_sysconfdir}/%{name}/torrc
+
+mkdir -p -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
+cat %{SOURCE1} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+mkdir -p -m 755 %{buildroot}%{_sysconfdir}/sysconfig/
+cat %{SOURCE3} > %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+
+mkdir -p -m 700 %{buildroot}%{_localstatedir}/lib/%{name}
+mkdir -p -m 755 %{buildroot}%{_var}/%{name}
+mkdir -p -m 755 %{buildroot}%{_var}/log/%{name}
+
+# Bash completion
+mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
+echo 'complete -F _command $filenames torify' > %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
+
+# Systemd support
+install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service
+install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+