diff --git a/.cvsignore b/.cvsignore
index 10e5191..a4f509a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-syncevolution-0.8.1a.tar.gz
+syncevolution-0.9.tar.gz
diff --git a/sources b/sources
index 25295e8..95bf1b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4bb354520530da4846f3c216d50d42f  syncevolution-0.8.1a.tar.gz
+480529e14bc895035824f5d7cce71228  syncevolution-0.9.tar.gz
diff --git a/syncevolution-0.8.1a-build.patch b/syncevolution-0.8.1a-build.patch
deleted file mode 100644
index 9a39293..0000000
--- a/syncevolution-0.8.1a-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up syncevolution-0.8.1a/src/client-api/src/c++/posix/http/TransportAgentFactory.cpp.build syncevolution-0.8.1a/src/client-api/src/c++/posix/http/TransportAgentFactory.cpp
---- syncevolution-0.8.1a/src/client-api/src/c++/posix/http/TransportAgentFactory.cpp.build	2009-03-26 17:26:00.000000000 +0100
-+++ syncevolution-0.8.1a/src/client-api/src/c++/posix/http/TransportAgentFactory.cpp	2009-03-26 17:26:08.000000000 +0100
-@@ -39,7 +39,7 @@
- #include "http/CurlTransportAgent.h"
- #elif FUN_TRANSPORT_AGENT == FUN_MAC_TRANSPORT_AGENT
- #include "http/MacTransportAgent.h"
--#elif
-+#else
- #error "No Transport agent defined, cannot compile"
- #endif
- 
diff --git a/syncevolution.spec b/syncevolution.spec
index 5ae7fe8..f19131e 100644
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@ -1,56 +1,106 @@
 Summary: SyncML client for evolution
 Name: syncevolution
-Version: 0.8.1a
+Version: 0.9
 Release: 1%{?dist}
-License: GPLv2+
+License: LGPLv2+
 Group: Applications/Productivity
-URL: http://www.estamos.de/projects/SyncML/
-Source0: http://www.estamos.de/download/syncevolution/sources/%{name}-%{version}.tar.gz
-# Patch filed upstream at
-# https://sourceforge.net/tracker/index.php\
-#     ?func=detail&aid=2707496&group_id=146288&atid=764733
-Patch0: syncevolution-0.8.1a-build.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: evolution
-Requires: curl
-BuildRequires: evolution-data-server-devel
-BuildRequires: curl-devel
+URL: http://syncevolution.org/
+Source: http://downloads.syncevolution.org/syncevolution/sources/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: boost-devel
 BuildRequires: cppunit-devel
-BuildRequires: gcc-c++
+BuildRequires: evolution-data-server-devel
+BuildRequires: expat-devel
+BuildRequires: glib2-devel
+BuildRequires: libsoup-devel
+BuildRequires: libical-devel
+BuildRequires: pcre-devel
+BuildRequires: libcurl-devel
+BuildRequires: gnome-keyring-devel
+BuildRequires: intltool automake libtool autoconf
 
 %description
 syncevolution is designed to provide a SyncML client that can
 connect to and sync with various SyncML-based servers
 
+%package devel
+Summary: Development package for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+Files for development with %{name}.
+
 %prep
 %setup -q
-%patch0 -p1 -b .build
-%configure --enable-unit-tests
+# use the ac macros in Makefile.am
+sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
+touch -r Makefile-gen.am Makefile.am
 
 %build
+intltoolize --automake --copy --force
+autoreconf -fiv
+(cd src/synthesis && mkdir m4 && autoreconf -fi)
+%configure --enable-unit-tests --enable-libsoup  \
+    --enable-dbus-service --enable-shared --with-expat=system \
+    --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g
+	s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 find . -type d -perm 02755 -exec chmod 0755 '{}' \;
 
-%check
-# FIXME: currently doesn't work at all, all tests fail; need to be
-# discussed with upstream.
-#make check
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/share
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/testcases
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+
+#Remove libtool archives and static libs
+find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+#make test
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS NEWS README COPYING HACKING
+%doc AUTHORS NEWS README COPYING HACKING LICENSE.LGPL-21 LICENSE.txt
+%{_sysconfdir}/default/syncevolution
 %{_bindir}/*
+%{_libdir}/*so.0*
+%{_libdir}/syncevolution/*so.0*
+%{_libexecdir}/syncevo-dbus-server
+%{_datadir}/dbus-1/services/org.Moblin.SyncEvolution.service
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/syncevo-dbus
+%{_includedir}/synthesis
+%{_libdir}/pkgconfig/syncevo-dbus.pc
+%{_libdir}/pkgconfig/synthesis.pc
+%{_libdir}/*so
+%{_libdir}/syncevolution/*so
 
 %changelog
+* Fri Sep 25 2009 Matěj Cepl <mcepl@redhat.com> - 0.9-1
+- New upstream release.
+
+* Wed Aug  5 2009 Matěj Cepl <mcepl@redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.3
+- missing BuildRequires
+
+* Wed Aug  5 2009 Stepan Kasal <skasal@redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.2
+- fixing autoconfigury; now it fails in a later stage of build ;-)
+
+* Wed Aug  5 2009 Matěj Cepl <mcepl@redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.1
+- fixing rpath, currently FTBFS!!!
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 23 2009 Matej Cepl <mcepl@redhat.com> 0.8.1a-1
 - New upstream release.
 - make a fix for one #elif which should be #else