diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 967c604..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wbxml2
-# $Id$
-NAME := wbxml2
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/wbxml2.spec b/wbxml2.spec
index 284073a..1bab378 100644
--- a/wbxml2.spec
+++ b/wbxml2.spec
@@ -1,10 +1,10 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        4%{?dist}
-Summary:        WBXML parser and compiler library
+Release:        9%{?dist}
+Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://libwbxml.aymerick.com:8080/
 Source0:        http://dl.sourceforge.net/wbxmllib/%{name}-%{version}.tar.gz
 
@@ -18,7 +18,6 @@ Patch2:         wbxml2-0.9.2-autoreconf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel zlib-devel popt 
-BuildRequires:  recode
 
 %description
 The WBXML Library (libwbxml) contains a library and its associated tools to
@@ -28,10 +27,11 @@ bandwidth in mobile communications.
 
 %package devel
 Group:         Development/Libraries
-Summary:       Development files of WBXML
+Summary:       Development files of %{name}
 Requires:      %{name} = %{version}-%{release}
 %description devel
-%{summary}.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
@@ -42,11 +42,13 @@ chmod a+x configure
 
 # Recode to UTF-8 several doc files
 for file in ChangeLog README NEWS References; do
-  recode l1..utf8 $file
+  /usr/bin/iconv -f iso8859-1 -t utf-8 $file > ${file}.conv \
+     && /bin/mv ${file}.conv $file
 done
 
 # no line terminator, add one
 echo >> THANKS
+echo >> BUGS
 
 %build
 %configure --disable-rpath --disable-static
@@ -86,6 +88,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 26 2007 Laurent Rineau <laurent.rineau__fedora@normalesup.org> - 0.9.2-9
+- Change the License: tag.
+
+* Fri Dec  1 2006 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 0.9.2-8
+- Stupidity. Fix the use of iconv. Bug #217848 again.
+- Add an end-of-line to BUGS as well.
+
+* Thu Nov 30 2006 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 0.9.2-6
+- Use iconv instead of recode. Bug #217848.
+
+* Mon Nov 27 2006 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 0.9.2-5
+- Changed the Summarys and descriptions.
+
 * Mon Nov 27 2006 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 0.9.2-4
 - Added BR: popt zlib-devel
 - Improved changelog.