diff --git a/.cvsignore b/.cvsignore
index 23942da..428d570 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-kdevelop-3.0.4.tar.bz2
+kdevelop-3.1.0.tar.bz2
diff --git a/kdevelop.spec b/kdevelop.spec
index df17b4c..21c1645 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -1,19 +1,19 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.2.3
-%define qt_version 3.3.2
+%define kde_version 3.3.0
+%define qt_version 3.3.3
 
 %define libtool 1
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.0.4
-Release: 1
+Version: 3.1.0
+Release: 2
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 License: GPL
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -23,7 +23,7 @@ Source2: kdevelop
 Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kde-libtool.patch
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
-Patch4: kdevelop-3.0.3-misc.patch
+Patch4: kdevelop-3.1.0-fpic.patch
 
 Prereq: /sbin/ldconfig
 
@@ -39,7 +39,6 @@ BuildPrereq: autoconf
 BuildPrereq: automake
 BuildPrereq: libtool
 BuildPrereq: kdelibs-devel >= %{kde_version}
-BuildRequires: db4-devel
 Obsoletes: kdevelop-c_c++_ref
 
 %description
@@ -72,7 +71,7 @@ individual needs.
 %patch1 -p0 -b .config
 %patch2 -p1 -b .libtool
 %patch3 -p1 -b .doc
-%patch4 -p1 -b .misc
+%patch4 -p1
 
 %build
 export KDEDIR=%{_prefix}
@@ -120,6 +119,9 @@ make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=$RPM_BUILD_ROOT install
 # remove duplicat, konflict with kdelibs
 rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/text/x-pascal.desktop
 
+# remove useless files
+rm -rf $RPM_BUILD_ROOT%{_prefix}/kdevbdb
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -144,6 +146,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/servicetypes/*
 
 %changelog
+* Thu Sep 02 2004 Than Ngo <than@redhat.com> 3.1.0-2
+- remove kdevelop-gdb_shared_library.patch, it's include in new upstream
+- cleanup specfile 
+
+* Wed Sep 01 2004 Than Ngo <than@redhat.com> 3.1.0-1
+- update to 3.1.0
+
+* Tue Aug 10 2004 Than Ngo <than@redhat.com> 3.1.0-0.1.rc2
+- update to 3.1.0 rc2
+
 * Sat Jun 19 2004 Than Ngo <than@redhat.com> 3.0.4-1 
 - update to 3.0.4
 
diff --git a/sources b/sources
index b08b7b7..d894287 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-c4a84b34927e6f1c7fb2bfb9a74b5b34  kdevelop-3.0.4.tar.bz2
+a08e2792f895d4c96723edec17617567  kdevelop-3.1.0.tar.bz2