diff --git a/.cvsignore b/.cvsignore
index 9c922ba..92b7e5d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-multitail-4.2.0.tgz
+multitail-5.2.2.tgz
diff --git a/multitail.spec b/multitail.spec
index c6cb142..e70237e 100644
--- a/multitail.spec
+++ b/multitail.spec
@@ -1,10 +1,10 @@
 Name:           multitail
-Version:        4.2.0
-Release:        3%{?dist}
+Version:        5.2.2
+Release:        1%{?dist}
 Summary:        View one or multiple files like tail but with multiple windows
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv1
 URL:            http://www.vanheusden.com/multitail/
 Source:         http://www.vanheusden.com/multitail/multitail-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,14 +28,21 @@ of shell scripts and other software. When viewing the output of
 external software, MultiTail can mimic the functionality of tools like
 'watch' and such.
 
-
 %prep
-%setup -q
-
+%setup -q -n multitail-%{version}
 
 %build
 CFLAGS="%{optflags}" %{__make} %{?_smp_mflags}
 
+# Fix up doc encoding
+iconv -f ISO88592 -t UTF8 < Changes > Changes.UTF8
+mv Changes.UTF8 Changes
+iconv -f ISO88592 -t UTF8 < readme.txt > readme.txt.UTF8
+mv readme.txt.UTF8 readme.txt
+
+# Fix up examples permissions
+chmod 644 colors-example.*
+chmod 644 convert-*.pl
 
 %install
 %{__rm} -rf %{buildroot}
@@ -44,22 +51,30 @@ CFLAGS="%{optflags}" %{__make} %{?_smp_mflags}
         %{buildroot}%{_sysconfdir}
 %{__make} install DESTDIR="%{buildroot}"
 
+# move the configuration in the right place
 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}
 
-
 %files
 %defattr(-, root, root, 0755)
-%doc *.conf *.html Changes license.txt readme.txt
+%doc *.conf *.html Changes license.txt readme.txt colors-example.* convert-*.pl
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_bindir}/multitail
 %{_mandir}/man1/multitail.1*
 
-
 %changelog
+* Tue Jul  8 2008 Fabio M. Di Nitto <fdinitto@redhat.com> - 5.2.2-1
+- New upstream release
+- Fix licence tag
+- Fix documentation encoding to UTF8
+- Install some examples in doc dir
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.2.0-3
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index 394b2d0..65251eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a5bd73d166973b117083ed513a9246e  multitail-4.2.0.tgz
+ab2c198381e9ff6271ce56bdcb06f963  multitail-5.2.2.tgz