diff --git a/.cvsignore b/.cvsignore
index 89fe038..040067d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libxml++-2.26.0.tar.bz2
+libxml++-2.30.0.tar.bz2
diff --git a/libxml++.spec b/libxml++.spec
index 7db2fdc..2d56ca8 100644
--- a/libxml++.spec
+++ b/libxml++.spec
@@ -1,6 +1,7 @@
+%global 	apiver 2.6
 Name:           libxml++
-Version:        2.26.0
-Release:        2%{?dist}
+Version:        2.30.0
+Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -31,7 +32,8 @@ This package contains the headers and libraries for libxml++ development.
 
 %prep
 %setup -q
-
+# fix wrong end of line
+sed -i s'#\r##' examples/dom_parser/example_with_namespace.xml
 
 %build
 %configure --disable-static
@@ -45,8 +47,9 @@ find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f
 # Modify temporary working directories for files section.
 rm -rf _reference _examples _manual
 mkdir -m 755 _reference _examples _manual
-cp -a $RPM_BUILD_ROOT%{_docdir}/*/docs/reference/html _reference/reference
-cp -a $RPM_BUILD_ROOT%{_docdir}/*/docs/manual _manual/manual
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{apiver}/reference/html _reference/reference
+#cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{apiver}/manual _manual/manual
+mv docs/manual/html _manual/manual
 rm -rf $RPM_BUILD_ROOT%{_docdir}
 cp -a examples _examples/examples
 
@@ -55,6 +58,11 @@ cp -a examples _examples/examples
 find _examples -type f -a \( -name Makefile\* -o -name \*.o \
     -o \( -name example -a -perm +0111 \) -o -empty \) | xargs rm -f
 find _examples -type d -name '*.libs' -o -name '.deps' | xargs rm -rf
+# fix devhelp index file 
+sed -i "s#"$RPM_BUILD_ROOT"##g" \
+	$RPM_BUILD_ROOT%{_datadir}/devhelp/books/%{name}-%{apiver}/%{name}-%{apiver}.devhelp2
+sed -i "s#"/%{name}-%{apiver}/reference/html"#"/%{name}-devel-%{version}/reference"#" \
+        $RPM_BUILD_ROOT%{_datadir}/devhelp/books/%{name}-%{apiver}/%{name}-%{apiver}.devhelp2
 
 
 %post -p /sbin/ldconfig
@@ -79,12 +87,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
-%dir %{_libdir}/%{name}-2.6
-%dir %{_libdir}/%{name}-2.6/include
-%{_libdir}/%{name}-2.6/include/*.h
-
+%dir %{_libdir}/%{name}-%{apiver}
+%dir %{_libdir}/%{name}-%{apiver}/include
+%{_libdir}/%{name}-%{apiver}/include/*.h
+%{_datadir}/devhelp/books/%{name}-%{apiver}/%{name}-%{apiver}.devhelp2
 
 %changelog
+* Fri Apr 09 2010 Haïkel Guémar <hguemar@gmail.com> - 2.30.0-1
+- Update to upstream 2.30.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.26.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 449dd98..deb13a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a52fc7e6e44bb5cc187672930b843f72  libxml++-2.26.0.tar.bz2
+ae752b65c016391cbca40bc73bcc67c0  libxml++-2.30.0.tar.bz2