diff --git a/.cvsignore b/.cvsignore
index 92b7e5d..cd1e00f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-multitail-5.2.2.tgz
+multitail-5.2.6.tgz
diff --git a/multitail.spec b/multitail.spec
index 0d92c5c..0c21b28 100644
--- a/multitail.spec
+++ b/multitail.spec
@@ -1,17 +1,17 @@
-Name:           multitail
-Version:        5.2.2
-Release:        4%{?dist}
-Summary:        View one or multiple files like tail but with multiple windows
+Name:		multitail
+Version:	5.2.6
+Release:	1%{?dist}
+Summary:	View one or multiple files like tail but with multiple windows
 
-Group:          Applications/Text
-# No version attribution, aside from the manpage, which is almost certainly just out of 
-# date.
-License:        GPL+
-URL:            http://www.vanheusden.com/multitail/
-Source:         http://www.vanheusden.com/multitail/multitail-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:		Applications/Text
+License:	GPLv2
+URL:		http://www.vanheusden.com/multitail/
+Source:		http://www.vanheusden.com/multitail/multitail-%{version}.tgz
 
-BuildRequires:  ncurses-devel
+## Setup/build bits
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:	ncurses-devel
 
 %description
 MultiTail lets you view one or multiple files like the original tail
@@ -47,21 +47,22 @@ chmod 644 colors-example.*
 chmod 644 convert-*.pl
 
 %install
-%{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_bindir} \
-        %{buildroot}%{_mandir}/man1/ \
-        %{buildroot}%{_sysconfdir}
-%{__make} install DESTDIR="%{buildroot}"
+rm -rf %{buildroot}
+install -d -m0755 %{buildroot}%{_bindir} \
+	%{buildroot}%{_mandir}/man1/ \
+	%{buildroot}%{_sysconfdir}
+make install DESTDIR=%{buildroot}
 
 # move the configuration in the right place
-mv %{buildroot}%{_sysconfdir}/multitail.conf.new %{buildroot}%{_sysconfdir}/multitail.conf
+mv %{buildroot}%{_sysconfdir}/multitail.conf.new \
+	%{buildroot}%{_sysconfdir}/multitail.conf
 
 # remove the examples (installed as docs)
 rm %{buildroot}%{_sysconfdir}/multitail/colors-example.*
 rm %{buildroot}%{_sysconfdir}/multitail/convert-*.pl
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
@@ -71,6 +72,14 @@ rm %{buildroot}%{_sysconfdir}/multitail/convert-*.pl
 %{_mandir}/man1/multitail.1*
 
 %changelog
+* Mon May 10 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 5.2.6-1
+- New upstream release
+  Resolves: rhbz#550857
+- Update spec file:
+  * Fix licence tag again
+  * Cleanup whitespaces
+  * Cleanup macros
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 65251eb..45ba522 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab2c198381e9ff6271ce56bdcb06f963  multitail-5.2.2.tgz
+6496b3d78660ff8d11c743a0d03cca34  multitail-5.2.6.tgz