diff --git a/.cvsignore b/.cvsignore
index ddf9e5a..fd6ffc5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-avrdude-5.3.1.tar.gz
+avrdude-5.5.tar.gz
diff --git a/avrdude.spec b/avrdude.spec
index e9fb298..844a69c 100644
--- a/avrdude.spec
+++ b/avrdude.spec
@@ -1,10 +1,10 @@
 Name:           avrdude
-Version:        5.3.1
-Release:        5%{?dist}
+Version:        5.5
+Release:        1%{?dist}
 Summary:        Software for programming Atmel AVR Microcontroller
 
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+
 URL:            http://www.bsdhome.com/avrdude/
 Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,6 +35,12 @@ particular chip.
 chmod -x safemode.c doc/TODO
 sed -i 's|/usr/local/etc/avrdude.conf|/etc/avrdude/avrdude.conf|g' doc/avrdude.texi avrdude.1
 sed -i 's|/etc/avrdude.conf|/etc/avrdude/avrdude.conf|g' doc/avrdude.texi avrdude.1
+iconv -f ISO88591 -t UTF8 < ChangeLog-2003 > ChangeLog-2003~
+mv ChangeLog-2003~ ChangeLog-2003
+iconv -f ISO88591 -t UTF8 < NEWS > NEWS~
+mv NEWS~ NEWS
+
+
 
 
 %build
@@ -65,7 +71,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc README AUTHORS ChangeLog* COPYING NEWS doc/TODO installed-docs/* 
+%doc README AUTHORS ChangeLog* COPYING NEWS doc/TODO installed-docs/*
 %config(noreplace) %{_sysconfdir}/%{name}
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -73,6 +79,10 @@ fi
 
 
 %changelog
+* Sat Dec 29 2007 Trond Danielsen <trond.danielsen@gmail.com> - 5.5-1
+- New upstream version
+- Fixed minor rpmlint warning.
+
 * Fri Mar 02 2007 Trond Danielsen <trond.danielsen@gmail.com> - 5.3.1-5
 - Added missing BuildRequire tetex-dvips.
 
diff --git a/sources b/sources
index dd79dd1..607097d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58c2be9f7a864b930ed9e6f1858f5cc7  avrdude-5.3.1.tar.gz
+60180d3f5f467987bfd7bc4505796fae  avrdude-5.5.tar.gz