diff --git a/.cvsignore b/.cvsignore
index ccf5922..4df1c05 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nautilus-2.24.2.tar.bz2
+nautilus-2.25.1.tar.bz2
diff --git a/nautilus-gvfs-desktop-key-2.patch b/nautilus-gvfs-desktop-key-2.patch
new file mode 100644
index 0000000..f5cc8dc
--- /dev/null
+++ b/nautilus-gvfs-desktop-key-2.patch
@@ -0,0 +1,176 @@
+diff -up nautilus-2.25.1/nautilus-browser.desktop.in.orig nautilus-2.25.1/nautilus-browser.desktop.in
+--- nautilus-2.25.1/nautilus-browser.desktop.in.orig	2008-12-01 11:58:56.000000000 +0100
++++ nautilus-2.25.1/nautilus-browser.desktop.in	2008-12-02 16:10:49.000000000 +0100
+@@ -4,6 +4,7 @@ _Name=File Browser
+ _Comment=Browse the file system with the file manager
+ TryExec=nautilus
+ Exec=nautilus --no-desktop --browser %U
++X-Gnome-Vfs-System=gio
+ Icon=system-file-manager
+ Terminal=false
+ StartupNotify=true
+diff -up nautilus-2.25.1/src/network-scheme.desktop.in.orig nautilus-2.25.1/src/network-scheme.desktop.in
+--- nautilus-2.25.1/src/network-scheme.desktop.in.orig	2008-09-14 14:14:22.000000000 +0200
++++ nautilus-2.25.1/src/network-scheme.desktop.in	2008-12-02 16:14:43.720426420 +0100
+@@ -4,6 +4,7 @@ _Name=Network
+ _Comment=Browse bookmarked and local network locations
+ TryExec=nautilus
+ Exec=nautilus --no-desktop network:
++X-Gnome-Vfs-System=gio
+ Terminal=false
+ StartupNotify=true
+ Type=Application
+diff -up nautilus-2.25.1/nautilus-browser.desktop.in.in.orig nautilus-2.25.1/nautilus-browser.desktop.in.in
+--- nautilus-2.25.1/nautilus-browser.desktop.in.in.orig	2008-10-02 14:26:49.000000000 +0200
++++ nautilus-2.25.1/nautilus-browser.desktop.in.in	2008-12-02 16:10:54.000000000 +0100
+@@ -4,6 +4,7 @@ _Name=File Browser
+ _Comment=Browse the file system with the file manager
+ TryExec=nautilus
+ Exec=nautilus --no-desktop --browser %U
++X-Gnome-Vfs-System=gio
+ Icon=system-file-manager
+ Terminal=false
+ StartupNotify=true
+diff -up nautilus-2.25.1/nautilus-autorun-software.desktop.in.orig nautilus-2.25.1/nautilus-autorun-software.desktop.in
+--- nautilus-2.25.1/nautilus-autorun-software.desktop.in.orig	2008-12-01 11:58:56.000000000 +0100
++++ nautilus-2.25.1/nautilus-autorun-software.desktop.in	2008-12-02 16:14:43.719759795 +0100
+@@ -3,6 +3,7 @@ Encoding=UTF-8
+ _Name=Autorun Prompt
+ TryExec=nautilus-autorun-software
+ Exec=nautilus-autorun-software %u
++X-Gnome-Vfs-System=gio
+ Icon=application-x-executable
+ NoDisplay=true
+ Terminal=false
+diff -up nautilus-2.25.1/nautilus.desktop.in.in.orig nautilus-2.25.1/nautilus.desktop.in.in
+--- nautilus-2.25.1/nautilus.desktop.in.in.orig	2008-10-02 14:26:50.000000000 +0200
++++ nautilus-2.25.1/nautilus.desktop.in.in	2008-12-02 16:09:52.000000000 +0100
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ _Name=File Manager
+ Exec=nautilus
++X-Gnome-Vfs-System=gio
+ Icon=system-file-manager
+ Terminal=false
+ Type=Application
+diff -up nautilus-2.25.1/nautilus-folder-handler.desktop.in.in.orig nautilus-2.25.1/nautilus-folder-handler.desktop.in.in
+--- nautilus-2.25.1/nautilus-folder-handler.desktop.in.in.orig	2008-09-14 14:14:27.000000000 +0200
++++ nautilus-2.25.1/nautilus-folder-handler.desktop.in.in	2008-12-02 16:14:43.777093017 +0100
+@@ -3,6 +3,7 @@ Encoding=UTF-8
+ _Name=Open Folder
+ TryExec=nautilus
+ Exec=nautilus --no-desktop %U
++X-Gnome-Vfs-System=gio
+ NoDisplay=true
+ Terminal=false
+ Icon=folder-open
+diff -up nautilus-2.25.1/nautilus.desktop.orig nautilus-2.25.1/nautilus.desktop
+--- nautilus-2.25.1/nautilus.desktop.orig	2008-12-01 11:59:05.000000000 +0100
++++ nautilus-2.25.1/nautilus.desktop	2008-12-02 16:10:32.000000000 +0100
+@@ -92,6 +92,7 @@ Name[zh_HK]=檔案總管
+ Name[zh_TW]=檔案總管
+ Name[zu]=Mphathi Hele
+ Exec=nautilus
++X-Gnome-Vfs-System=gio
+ Icon=system-file-manager
+ Terminal=false
+ Type=Application
+diff -up nautilus-2.25.1/nautilus-autorun-software.desktop.in.in.orig nautilus-2.25.1/nautilus-autorun-software.desktop.in.in
+--- nautilus-2.25.1/nautilus-autorun-software.desktop.in.in.orig	2008-09-14 14:14:27.000000000 +0200
++++ nautilus-2.25.1/nautilus-autorun-software.desktop.in.in	2008-12-02 16:14:43.827591738 +0100
+@@ -3,6 +3,7 @@ Encoding=UTF-8
+ _Name=Autorun Prompt
+ TryExec=nautilus-autorun-software
+ Exec=nautilus-autorun-software %u
++X-Gnome-Vfs-System=gio
+ Icon=application-x-executable
+ NoDisplay=true
+ Terminal=false
+diff -up nautilus-2.25.1/nautilus.desktop.in.orig nautilus-2.25.1/nautilus.desktop.in
+--- nautilus-2.25.1/nautilus.desktop.in.orig	2008-12-01 11:58:56.000000000 +0100
++++ nautilus-2.25.1/nautilus.desktop.in	2008-12-02 16:10:17.000000000 +0100
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ _Name=File Manager
+ Exec=nautilus
++X-Gnome-Vfs-System=gio
+ Icon=system-file-manager
+ Terminal=false
+ Type=Application
+diff -up nautilus-2.25.1/nautilus-home.desktop.in.orig nautilus-2.25.1/nautilus-home.desktop.in
+--- nautilus-2.25.1/nautilus-home.desktop.in.orig	2008-12-01 11:58:56.000000000 +0100
++++ nautilus-2.25.1/nautilus-home.desktop.in	2008-12-02 16:14:43.911840155 +0100
+@@ -4,6 +4,7 @@ _Name=Home Folder
+ _Comment=Open your personal folder
+ TryExec=nautilus
+ Exec=nautilus --no-desktop
++X-Gnome-Vfs-System=gio
+ Icon=user-home
+ Terminal=false
+ StartupNotify=true
+diff -up nautilus-2.25.1/nautilus-computer.desktop.in.in.orig nautilus-2.25.1/nautilus-computer.desktop.in.in
+--- nautilus-2.25.1/nautilus-computer.desktop.in.in.orig	2008-09-14 14:14:27.000000000 +0200
++++ nautilus-2.25.1/nautilus-computer.desktop.in.in	2008-12-02 16:14:43.936451077 +0100
+@@ -4,6 +4,7 @@ _Name=Computer
+ _Comment=Browse all local and remote disks and folders accessible from this computer
+ TryExec=nautilus
+ Exec=nautilus --no-desktop computer:
++X-Gnome-Vfs-System=gio
+ Icon=computer
+ Terminal=false
+ StartupNotify=true
+diff -up nautilus-2.25.1/nautilus-home.desktop.in.in.orig nautilus-2.25.1/nautilus-home.desktop.in.in
+--- nautilus-2.25.1/nautilus-home.desktop.in.in.orig	2008-09-14 14:14:27.000000000 +0200
++++ nautilus-2.25.1/nautilus-home.desktop.in.in	2008-12-02 16:14:43.961667122 +0100
+@@ -4,6 +4,7 @@ _Name=Home Folder
+ _Comment=Open your personal folder
+ TryExec=nautilus
+ Exec=nautilus --no-desktop
++X-Gnome-Vfs-System=gio
+ Icon=user-home
+ Terminal=false
+ StartupNotify=true
+diff -up nautilus-2.25.1/nautilus-computer.desktop.in.orig nautilus-2.25.1/nautilus-computer.desktop.in
+--- nautilus-2.25.1/nautilus-computer.desktop.in.orig	2008-12-01 11:58:55.000000000 +0100
++++ nautilus-2.25.1/nautilus-computer.desktop.in	2008-12-02 16:14:44.028541929 +0100
+@@ -4,6 +4,7 @@ _Name=Computer
+ _Comment=Browse all local and remote disks and folders accessible from this computer
+ TryExec=nautilus
+ Exec=nautilus --no-desktop computer:
++X-Gnome-Vfs-System=gio
+ Icon=computer
+ Terminal=false
+ StartupNotify=true
+diff -up nautilus-2.25.1/nautilus-file-management-properties.desktop.in.orig nautilus-2.25.1/nautilus-file-management-properties.desktop.in
+--- nautilus-2.25.1/nautilus-file-management-properties.desktop.in.orig	2008-12-01 11:58:55.000000000 +0100
++++ nautilus-2.25.1/nautilus-file-management-properties.desktop.in	2008-12-02 16:14:44.053759916 +0100
+@@ -3,6 +3,7 @@ Encoding=UTF-8
+ _Name=File Management
+ _Comment=Change the behaviour and appearance of file manager windows
+ Exec=nautilus-file-management-properties
++X-Gnome-Vfs-System=gio
+ Icon=system-file-manager
+ Terminal=false
+ Type=Application
+diff -up nautilus-2.25.1/nautilus-folder-handler.desktop.in.orig nautilus-2.25.1/nautilus-folder-handler.desktop.in
+--- nautilus-2.25.1/nautilus-folder-handler.desktop.in.orig	2008-12-01 11:58:56.000000000 +0100
++++ nautilus-2.25.1/nautilus-folder-handler.desktop.in	2008-12-02 16:14:44.078976570 +0100
+@@ -3,6 +3,7 @@ Encoding=UTF-8
+ _Name=Open Folder
+ TryExec=nautilus
+ Exec=nautilus --no-desktop %U
++X-Gnome-Vfs-System=gio
+ NoDisplay=true
+ Terminal=false
+ Icon=folder-open
+diff -up nautilus-2.25.1/nautilus-file-management-properties.desktop.in.in.orig nautilus-2.25.1/nautilus-file-management-properties.desktop.in.in
+--- nautilus-2.25.1/nautilus-file-management-properties.desktop.in.in.orig	2008-09-14 14:14:27.000000000 +0200
++++ nautilus-2.25.1/nautilus-file-management-properties.desktop.in.in	2008-12-02 16:14:44.104262369 +0100
+@@ -3,6 +3,7 @@ Encoding=UTF-8
+ _Name=File Management
+ _Comment=Change the behaviour and appearance of file manager windows
+ Exec=nautilus-file-management-properties
++X-Gnome-Vfs-System=gio
+ Icon=system-file-manager
+ Terminal=false
+ Type=Application
diff --git a/nautilus-gvfs-desktop-key.patch b/nautilus-gvfs-desktop-key.patch
deleted file mode 100644
index 8069beb..0000000
--- a/nautilus-gvfs-desktop-key.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- nautilus-autorun-software.desktop.in~	2008-04-02 06:53:05.000000000 -0400
-+++ nautilus-autorun-software.desktop.in	2008-04-17 20:08:52.000000000 -0400
-@@ -3,6 +3,7 @@
- _Name=Autorun Prompt
- TryExec=nautilus-autorun-software
- Exec=nautilus-autorun-software %u
-+X-Gnome-Vfs-System=gio
- Icon=application-x-executable
- NoDisplay=true
- Terminal=false
---- src/network-scheme.desktop.in~	2008-03-29 05:40:25.000000000 -0400
-+++ src/network-scheme.desktop.in	2008-04-17 20:08:48.000000000 -0400
-@@ -4,6 +4,7 @@
- _Comment=Browse bookmarked and local network locations
- TryExec=nautilus
- Exec=nautilus --no-desktop network:
-+X-Gnome-Vfs-System=gio
- Terminal=false
- StartupNotify=true
- Type=Application
---- nautilus.desktop.in.in~	2008-03-29 05:40:44.000000000 -0400
-+++ nautilus.desktop.in.in	2008-04-17 20:08:45.000000000 -0400
-@@ -4,6 +4,7 @@
- _Comment=Browse the file system with the file manager
- TryExec=nautilus
- Exec=nautilus --no-desktop --browser %U
-+X-Gnome-Vfs-System=gio
- Icon=system-file-manager
- Terminal=false
- StartupNotify=true
---- nautilus-folder-handler.desktop.in.in~	2008-03-29 05:40:44.000000000 -0400
-+++ nautilus-folder-handler.desktop.in.in	2008-04-17 20:08:41.000000000 -0400
-@@ -3,6 +3,7 @@
- _Name=Open Folder
- TryExec=nautilus
- Exec=nautilus --no-desktop %U
-+X-Gnome-Vfs-System=gio
- NoDisplay=true
- Terminal=false
- Icon=folder-open
---- nautilus.desktop~	2008-04-07 15:57:49.000000000 -0400
-+++ nautilus.desktop	2008-04-17 20:08:35.000000000 -0400
-@@ -150,6 +150,7 @@
- Comment[zh_TW]=使用檔案總管瀏覽檔案系統
- TryExec=nautilus
- Exec=nautilus --no-desktop --browser %U
-+X-Gnome-Vfs-System=gio
- Icon=system-file-manager
- Terminal=false
- StartupNotify=true
---- nautilus-autorun-software.desktop.in.in~	2008-03-29 05:40:44.000000000 -0400
-+++ nautilus-autorun-software.desktop.in.in	2008-04-17 20:08:29.000000000 -0400
-@@ -3,6 +3,7 @@
- _Name=Autorun Prompt
- TryExec=nautilus-autorun-software
- Exec=nautilus-autorun-software %u
-+X-Gnome-Vfs-System=gio
- Icon=application-x-executable
- NoDisplay=true
- Terminal=false
---- nautilus.desktop.in~	2008-04-02 06:53:04.000000000 -0400
-+++ nautilus.desktop.in	2008-04-17 20:08:23.000000000 -0400
-@@ -4,6 +4,7 @@
- _Comment=Browse the file system with the file manager
- TryExec=nautilus
- Exec=nautilus --no-desktop --browser %U
-+X-Gnome-Vfs-System=gio
- Icon=system-file-manager
- Terminal=false
- StartupNotify=true
---- nautilus-home.desktop.in~	2008-04-02 06:53:04.000000000 -0400
-+++ nautilus-home.desktop.in	2008-04-17 20:08:20.000000000 -0400
-@@ -4,6 +4,7 @@
- _Comment=Open your personal folder
- TryExec=nautilus
- Exec=nautilus --no-desktop
-+X-Gnome-Vfs-System=gio
- Icon=user-home
- Terminal=false
- StartupNotify=true
---- nautilus-computer.desktop.in.in~	2008-03-29 05:40:44.000000000 -0400
-+++ nautilus-computer.desktop.in.in	2008-04-17 20:08:17.000000000 -0400
-@@ -4,6 +4,7 @@
- _Comment=Browse all local and remote disks and folders accessible from this computer
- TryExec=nautilus
- Exec=nautilus --no-desktop computer:
-+X-Gnome-Vfs-System=gio
- Icon=computer
- Terminal=false
- StartupNotify=true
---- nautilus-home.desktop.in.in~	2008-03-29 05:40:44.000000000 -0400
-+++ nautilus-home.desktop.in.in	2008-04-17 20:08:14.000000000 -0400
-@@ -4,6 +4,7 @@
- _Comment=Open your personal folder
- TryExec=nautilus
- Exec=nautilus --no-desktop
-+X-Gnome-Vfs-System=gio
- Icon=user-home
- Terminal=false
- StartupNotify=true
---- nautilus-computer.desktop.in~	2008-04-02 06:53:04.000000000 -0400
-+++ nautilus-computer.desktop.in	2008-04-17 20:08:11.000000000 -0400
-@@ -4,6 +4,7 @@
- _Comment=Browse all local and remote disks and folders accessible from this computer
- TryExec=nautilus
- Exec=nautilus --no-desktop computer:
-+X-Gnome-Vfs-System=gio
- Icon=computer
- Terminal=false
- StartupNotify=true
---- nautilus-file-management-properties.desktop.in~	2008-04-02 06:53:04.000000000 -0400
-+++ nautilus-file-management-properties.desktop.in	2008-04-17 20:08:07.000000000 -0400
-@@ -3,6 +3,7 @@
- _Name=File Management
- _Comment=Change the behaviour and appearance of file manager windows
- Exec=nautilus-file-management-properties
-+X-Gnome-Vfs-System=gio
- Icon=system-file-manager
- Terminal=false
- Type=Application
---- nautilus-folder-handler.desktop.in~	2008-04-02 06:53:04.000000000 -0400
-+++ nautilus-folder-handler.desktop.in	2008-04-17 20:08:04.000000000 -0400
-@@ -3,6 +3,7 @@
- _Name=Open Folder
- TryExec=nautilus
- Exec=nautilus --no-desktop %U
-+X-Gnome-Vfs-System=gio
- NoDisplay=true
- Terminal=false
- Icon=folder-open
---- nautilus-file-management-properties.desktop.in.in~	2008-03-29 05:40:45.000000000 -0400
-+++ nautilus-file-management-properties.desktop.in.in	2008-04-17 20:08:00.000000000 -0400
-@@ -3,6 +3,7 @@
- _Name=File Management
- _Comment=Change the behaviour and appearance of file manager windows
- Exec=nautilus-file-management-properties
-+X-Gnome-Vfs-System=gio
- Icon=system-file-manager
- Terminal=false
- Type=Application
diff --git a/nautilus.spec b/nautilus.spec
index eb4a4d6..8d45a71 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,4 +1,4 @@
-%define glib2_version 2.18.3
+%define glib2_version 2.19.2
 %define pango_version 1.1.3
 %define gtk2_version 2.11.6
 %define libgnomeui_version 2.6.0
@@ -18,7 +18,7 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.24.2
+Version: 	2.25.1
 Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
@@ -91,7 +91,7 @@ Patch6:         nautilus-2.23.5-dynamic-search.patch
 Patch7:		rtl-fix.patch
 #Patch8:		nautilus-2.22.1-hide-white-screen.patch
 
-Patch10:        nautilus-gvfs-desktop-key.patch
+Patch10:        nautilus-gvfs-desktop-key-2.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=171655
 Patch15:	nautilus-2.22.0-treeview-xds-dnd.patch
@@ -134,7 +134,7 @@ for developing nautilus extensions.
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
-%patch10 -p0 -b .gvfs-desktop-key
+%patch10 -p1 -b .gvfs-desktop-key
 %patch15 -p0 -b .xds
 %patch17 -p0 -b .symlink
 
@@ -265,6 +265,9 @@ fi
 
 
 %changelog
+* Tue Dec  2 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.25.1-1
+- Update to 2.25.1
+
 * Wed Nov 26 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.24.2-1
 - Update to 2.24.2
 
diff --git a/sources b/sources
index d854583..7d4c40c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-783e5f7be6391d6c46b4725e38af475a  nautilus-2.24.2.tar.bz2
+287f08773a561bf504d2c6e07ada35b2  nautilus-2.25.1.tar.bz2