diff --git a/.cvsignore b/.cvsignore
index 6c2588d..97b1049 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
 kdevelop-3.3.4.tar.bz2
 kdevelop-3.4.1.tar.bz2
+kdevelop-3.5.0.tar.bz2
diff --git a/kdevelop-3.4.1-svn.patch b/kdevelop-3.4.1-svn.patch
deleted file mode 100644
index b10b8cc..0000000
--- a/kdevelop-3.4.1-svn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kdevelop-3.4.1/vcs/subversion/configure.in.in.svn kdevelop-3.4.1/vcs/subversion/configure.in.in
---- kdevelop-3.4.1/vcs/subversion/configure.in.in.svn	2007-05-14 02:41:14.000000000 -0500
-+++ kdevelop-3.4.1/vcs/subversion/configure.in.in	2007-08-29 17:49:34.000000000 -0500
-@@ -131,7 +131,7 @@ else
- fi
- dnl fi // end of if test -x "$SVNCONFIG"; then
- 
--SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
-+SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_fs-1"
- SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
- SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
- 
diff --git a/kdevelop-3.5.0-autosave.patch b/kdevelop-3.5.0-autosave.patch
new file mode 100644
index 0000000..5e820bd
--- /dev/null
+++ b/kdevelop-3.5.0-autosave.patch
@@ -0,0 +1,25 @@
+--- branches/KDE/3.5/kdevelop/languages/cpp/cppsupportpart.cpp	2007/10/07 14:39:48	722530
++++ branches/KDE/3.5/kdevelop/languages/cpp/cppsupportpart.cpp	2007/10/23 22:58:44	728690
+@@ -2533,6 +2533,9 @@
+ 				QStringList l = files.res;
+ 				while(!l.isEmpty() ) {
+ 					emit addedSourceInfo( l.front() );
++					emit aboutToRemoveSourceInfo( l.front() );
++					emit removedSourceInfo( l.front() );
++					emit addedSourceInfo( l.front() );
+ 					l.pop_front();
+ 				}
+ 
+@@ -2542,9 +2545,11 @@
+ 				QStringList l = files.res;
+ 				while( !l.isEmpty() ) {
+ 					emit codeModelUpdated( l.front() );
++					emit aboutToRemoveSourceInfo( l.front() );
++					emit removedSourceInfo( l.front() );
++					emit addedSourceInfo( l.front() );
+ 					l.pop_front();
+ 				}
+-				emit updatedSourceInfo();
+ 			}
+ 		}
+ 		kdDebug( 9007 ) << "files in code-model after parseEmit: " << codeModel()->fileList().count() << " before: " << oldFileCount << endl;
diff --git a/kdevelop-3.5.0-svn.patch b/kdevelop-3.5.0-svn.patch
new file mode 100644
index 0000000..39c7267
--- /dev/null
+++ b/kdevelop-3.5.0-svn.patch
@@ -0,0 +1,12 @@
+diff -up kdevelop-3.5.0/vcs/subversion/configure.in.in.svn kdevelop-3.5.0/vcs/subversion/configure.in.in
+--- kdevelop-3.5.0/vcs/subversion/configure.in.in.svn	2007-10-08 04:50:02.000000000 -0500
++++ kdevelop-3.5.0/vcs/subversion/configure.in.in	2007-10-13 21:00:21.000000000 -0500
+@@ -117,7 +117,7 @@ if test "x$with_subversion" != xno; then
+         AC_MSG_RESULT([not found])
+         SVN_SUBDIR=
+     fi
+-    SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
++    SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_fs-1"
+     SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
+     SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
+ 
diff --git a/kdevelop.spec b/kdevelop.spec
index 49e381f..1895232 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -1,7 +1,8 @@
+
 %define debug 0
-%define final 0
+%define final 1 
 
-%define kde_version 3.5.7
+%define kde_version 3.5.8
 %define qt_version 3.3.8
 
 %define make_cvs 1
@@ -9,8 +10,8 @@
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
-Version: 3.4.1
-Release: 5%{?dist}
+Version: 3.5.0
+Release: 2%{?dist}
 
 License: GPLv2
 URL: http://www.kdevelop.org/
@@ -22,7 +23,10 @@ Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KD
 
 Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch
-Patch3: kdevelop-3.4.1-svn.patch
+Patch3: kdevelop-3.5.0-svn.patch
+
+#upstream patches
+Patch500: kdevelop-3.5.0-autosave.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -86,6 +90,7 @@ individual needs.
 %patch1 -p0 -b .config
 %patch2 -p1 -b .doc
 %patch3 -p1 -b .svn
+%patch500 -p4 -b .autosave
 
 %if %{make_cvs}
   rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
@@ -175,6 +180,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.5.0-2
+- autosave patch
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.5.0-1
+- kdevelop-3.5.0 (kde-3.5.8)
+
 * Mon Sep 03 2007 Than Ngo <than@redhat.com> - 9:3.4.1-5
 - rebuilt against apr
 
diff --git a/sources b/sources
index b565c66..293feb9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-abc6cc2831ad4c0f4da9fba9e38edce1  kdevelop-3.4.1.tar.bz2
+1101077b3a0164da463f60cad4f13e25  kdevelop-3.5.0.tar.bz2