diff --git a/.cvsignore b/.cvsignore
index 3b3888c..d8ca72f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nautilus-2.23.5.1.tar.bz2
+nautilus-2.23.6.tar.bz2
diff --git a/icon-names.patch b/icon-names.patch
deleted file mode 100644
index 62873a4..0000000
--- a/icon-names.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up nautilus-2.23.5.1/src/nautilus-file-management-properties.c.icon-names nautilus-2.23.5.1/src/nautilus-file-management-properties.c
---- nautilus-2.23.5.1/src/nautilus-file-management-properties.c.icon-names	2008-07-21 05:43:25.000000000 -0400
-+++ nautilus-2.23.5.1/src/nautilus-file-management-properties.c	2008-07-27 22:58:28.000000000 -0400
-@@ -801,7 +801,7 @@ nautilus_file_management_properties_dial
- 			       (GClosureNotify)g_object_unref,
- 			       0);
- 
--	gtk_window_set_icon_name (GTK_WINDOW (dialog), "file-manager");
-+	gtk_window_set_icon_name (GTK_WINDOW (dialog), "system-file-manager");
- 
- 	if (window) {
- 		gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window));
-diff -up nautilus-2.23.5.1/src/nautilus-navigation-window.c.icon-names nautilus-2.23.5.1/src/nautilus-navigation-window.c
---- nautilus-2.23.5.1/src/nautilus-navigation-window.c.icon-names	2008-07-27 22:58:53.000000000 -0400
-+++ nautilus-2.23.5.1/src/nautilus-navigation-window.c	2008-07-27 22:59:23.000000000 -0400
-@@ -1221,7 +1221,7 @@ static NautilusIconInfo *
- real_get_icon (NautilusWindow *window,
- 	       NautilusWindowSlot *slot)
- {
--	return nautilus_icon_info_lookup_from_name ("file-manager", 48);
-+	return nautilus_icon_info_lookup_from_name ("system-file-manager", 48);
- }
- 
- static void
diff --git a/nautilus.spec b/nautilus.spec
index de89dfb..b0311fd 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -18,8 +18,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.23.5.1
-Release:	3%{?dist}
+Version: 	2.23.6
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
@@ -98,9 +98,6 @@ Patch15:	nautilus-2.22.0-treeview-xds-dnd.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=545062
-Patch18:	icon-names.patch
-
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -140,7 +137,6 @@ for writing nautilus extensions.
 %patch14 -p1 -b .default-to-asking
 %patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
-%patch18 -p1 -b .icon-names
 
 %build
 
@@ -259,6 +255,9 @@ fi
 
 
 %changelog
+* Mon Aug  4 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.23.6-1
+- Update to 2.23.6
+
 * Sun Jul 27 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.5-3
 - More icon name fixes
 
diff --git a/sources b/sources
index f2c82b6..02eb8ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7daa0c01b7490975f693d24a28627cd  nautilus-2.23.5.1.tar.bz2
+5bb12352ef6b9e1fc6986cd872228a37  nautilus-2.23.6.tar.bz2