diff --git a/.cvsignore b/.cvsignore
index 0a5947d..3bad5e2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libopensync-plugin-kdepim-0.22.tar.bz2
+libopensync-plugin-kdepim-0.35.tar.bz2
diff --git a/libopensync-plugin-kdepim-0.22-qt33.patch b/libopensync-plugin-kdepim-0.22-qt33.patch
deleted file mode 100644
index e3098da..0000000
--- a/libopensync-plugin-kdepim-0.22-qt33.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libopensync-plugin-kdepim-0.22/m4/kde.m4.qt33 libopensync-plugin-kdepim-0.22/m4/kde.m4
---- libopensync-plugin-kdepim-0.22/m4/kde.m4.qt33	2007-09-27 09:36:46.000000000 +0200
-+++ libopensync-plugin-kdepim-0.22/m4/kde.m4	2007-09-27 09:37:26.000000000 +0200
-@@ -1217,7 +1217,7 @@ else
- fi
- 
- if test $kde_qtver = 3; then
--  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
-+  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib/qt-3.3"
- fi
- if test $kde_qtver = 2; then
-    kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
diff --git a/libopensync-plugin-kdepim-Makefile.patch b/libopensync-plugin-kdepim-Makefile.patch
deleted file mode 100644
index 01171a0..0000000
--- a/libopensync-plugin-kdepim-Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Makefile.in.orig	2007-04-25 17:51:56.000000000 +0200
-+++ src/Makefile.in	2007-04-25 17:52:08.000000000 +0200
-@@ -436,9 +436,9 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- kdepim_lib.la: $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(plugindir) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
-+	$(CXXLINK) $(kdepim_lib_la_LDFLAGS) $(kdepim_lib_la_OBJECTS) $(kdepim_lib_la_LIBADD) $(LIBS)
- kdepim_sync.la: $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(plugindir) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
-+	$(CXXLINK) $(kdepim_sync_la_LDFLAGS) $(kdepim_sync_la_OBJECTS) $(kdepim_sync_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
diff --git a/libopensync-plugin-kdepim.spec b/libopensync-plugin-kdepim.spec
index 9b1a351..0942ad7 100644
--- a/libopensync-plugin-kdepim.spec
+++ b/libopensync-plugin-kdepim.spec
@@ -1,54 +1,37 @@
 Name:           libopensync-plugin-kdepim
-Version:        0.22
-Release:        3%{?dist}
+Version:        0.35
+Release:        1%{?dist}
 Summary:        KDE plugin for libopensync
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://www.opensync.org
-# see http://www.opensync.org/wiki/download
-Source0:        %{name}-%{version}.tar.bz2
-Patch0:         libopensync-plugin-kdepim-Makefile.patch
-Patch1:		libopensync-plugin-kdepim-0.22-qt33.patch
+Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libopensync-devel
+BuildRequires:  cmake
+BuildRequires:  libopensync-devel >= 0.35
 BuildRequires:  libstdc++-devel
 BuildRequires:  kdepim-devel
 BuildRequires:  kdelibs-devel
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
 
 %description
 %{summary}
 
-%package devel
-Summary:        Development package for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       libopensync-devel
-
-%description    devel
-The %{name}-devel package contains the files needed for development
-with %{name}.
-
 %prep
 %setup -q
-%patch0
-%patch1 -p1 -b .qt33
-autoreconf
+
 %build
-%configure --disable-rpath
-# smpflags sometimes screw up the build
-make
+mkdir build
+cd build
+%cmake -DCMAKE_SKIP_RPATH=YES ../
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd build
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins/kdepim_lib.la
-rm $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins/kdepim_sync.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,11 +42,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/opensync/plugins/kdepim*.so
-%{_datadir}/opensync/defaults/kdepim-sync
+%doc AUTHORS COPYING README
+%{_libdir}/opensync-1.0/plugins/kdepim*.so
+%{_datadir}/opensync-1.0/defaults/kdepim-sync
 
 %changelog
+* Sat Dec 29 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.35-1
+- version upgrade
+
 * Thu Sep 27 2007 Oliver Falk <oliver@linux-kernel.at> 0.22-3
 - Add patch to support finding qt 3.3 in /usr/lib/qt-3.3
 
diff --git a/sources b/sources
index 2cf05b1..d94a809 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df4dea8183847da838e6494fcb4e7c0a  libopensync-plugin-kdepim-0.22.tar.bz2
+eaa2044e00f570b54155068f12726e5b  libopensync-plugin-kdepim-0.35.tar.bz2