diff --git a/.cvsignore b/.cvsignore
index 267bd7d..dafdf1d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,3 +8,4 @@ gnome-vfs-2.9.90.tar.bz2
 gnome-vfs-2.9.91.tar.bz2
 gnome-vfs-2.10.0.tar.bz2
 gnome-vfs-2.11.90.tar.bz2
+gnome-vfs-2.12.0.tar.bz2
diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 21ed50f..62c9d8e 100644
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -8,8 +8,8 @@
 
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
-Version: 2.11.90
-Release: 3
+Version: 2.12.0
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -45,13 +45,6 @@ Patch104:	gnome-vfs-2.8.2-browser_default.patch
 
 Patch201: gnome-vfs-2.8.1-console-mount-opt.patch
 
-# send to upstream
-#Patch202: gnome-vfs-2.9.91-hal-api-2.patch
-Patch203: gnome-vfs-handle-drives-without-media-detection.patch
-
-# possible gcc4 bug
-#Patch300: gnome-vfs-2.9.91-fix-gcc4-build.patch
-
 # Bug 150132
 Patch400: neon-0.24.7-gssapi.patch
 
@@ -99,12 +92,6 @@ shares (SMB) to applications using GNOME VFS.
 %patch104 -p1 -b .browser_default
 %patch201 -p0 -b .console
 
-#send to upstream
-#%patch202 -p0 -b .hal-api2
-%patch203 -p0 -b .hal-handle-drives-without-media-detection.patch
-
-#%patch300 -p0 -b .gcc4-build
-
 %patch400 -p0 -b .neon-gssapi 
 
 %build
@@ -184,6 +171,10 @@ done
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Sep  7 2005 Matthias Clasen <mclasen@redhat.com> 2.12.0-1
+- Update to 2.12.0
+- Drop upstreamed patches
+
 * Thu Aug 11 2005 David Zeuthen <davidz@redhat.com> 2.11.90-3
 - Add system_storage.schemas to SCHEMAS (#165703)
 
diff --git a/sources b/sources
index 8b0a983..d4cae85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6c55660c8190eb3c58c90c1a6988044  gnome-vfs-2.11.90.tar.bz2
+3323e7472a736716150337d2fc564a43  gnome-vfs-2.12.0.tar.bz2