diff --git a/nautilus-2.17.91.tar.bz2 b/nautilus-2.17.91.tar.bz2
deleted file mode 100644
index 4efced3..0000000
--- a/nautilus-2.17.91.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:434f6e9c154bfbc7b44d6d79dcda626ed59b17b274aad81c4751678451618503
-size 4305866
diff --git a/nautilus-2.18.0.1.tar.bz2 b/nautilus-2.18.0.1.tar.bz2
new file mode 100644
index 0000000..df146e5
--- /dev/null
+++ b/nautilus-2.18.0.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30fa5660a93d01d8711e974436a629de5659d034973dbff10c0734c507f03734
+size 4339093
diff --git a/nautilus-mime.patch b/nautilus-mime.patch
index 750330f..c50bce0 100644
--- a/nautilus-mime.patch
+++ b/nautilus-mime.patch
@@ -1,10 +1,24 @@
---- nautilus.desktop.in
+Index: nautilus.desktop.in
+===================================================================
+--- nautilus.desktop.in.orig
 +++ nautilus.desktop.in
-@@ -9,6 +9,7 @@
+@@ -1,16 +1,16 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ _Name=File Browser
+-_GenericName=Browse the file system with the file manager
++_Comment=Browse the file system with the file manager
+ TryExec=nautilus
+ Exec=nautilus --no-desktop --browser %U
+-Icon=gnome-fs-directory
++Icon=file-manager
+ Terminal=false
  StartupNotify=true
  Type=Application
- Categories=GNOME;Application;System;Utility;Core;
-+MimeType=inode/directory
+ Categories=GNOME;GTK;System;Utility;Core;
  OnlyShowIn=GNOME;
- DocPath=user-guide#gosnautilus-1
+-DocPath=user-guide#gosnautilus-1
++MimeType=inode/directory
  X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=nautilus
+ X-GNOME-Bugzilla-Component=general
diff --git a/nautilus-onlyshowin.patch b/nautilus-onlyshowin.patch
index 2569da8..1e05f65 100644
--- a/nautilus-onlyshowin.patch
+++ b/nautilus-onlyshowin.patch
@@ -3,19 +3,23 @@ http://bugzilla.gnome.org/show_bug.cgi?id=350947
 Make the .desktop files for Computer and arbitrary folders only show
 up in GNOME.
 
---- nautilus-2.15.4/nautilus-computer.desktop.in
-+++ nautilus-2.15.4/nautilus-computer.desktop.in
-@@ -9,6 +9,7 @@
+Index: nautilus-2.18.0.1/nautilus-computer.desktop.in
+===================================================================
+--- nautilus-2.18.0.1.orig/nautilus-computer.desktop.in
++++ nautilus-2.18.0.1/nautilus-computer.desktop.in
+@@ -9,6 +9,7 @@ Terminal=false
  StartupNotify=true
  Type=Application
- Categories=Application;Core;
+ Categories=GNOME;GTK;Core;
 +OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=nautilus
  X-GNOME-Bugzilla-Component=general
---- nautilus-2.15.4/nautilus-folder-handler.desktop.in
-+++ nautilus-2.15.4/nautilus-folder-handler.desktop.in
-@@ -7,6 +7,7 @@
+Index: nautilus-2.18.0.1/nautilus-folder-handler.desktop.in
+===================================================================
+--- nautilus-2.18.0.1.orig/nautilus-folder-handler.desktop.in
++++ nautilus-2.18.0.1/nautilus-folder-handler.desktop.in
+@@ -7,6 +7,7 @@ NoDisplay=true
  Terminal=false
  StartupNotify=true
  Type=Application
diff --git a/nautilus.changes b/nautilus.changes
index bcf35ff..2e8547f 100644
--- a/nautilus.changes
+++ b/nautilus.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Mar 22 15:57:21 CST 2007 - maw@suse.de
+
+- Update to version 2.18.0.1
+- intltool is now a build requirement
+- Several code cleanups
+- Bug fixes, including p.g.o 408155, 333151, 358172, 408155,
+  409276, 407150, 407618, and 368661.
+
 -------------------------------------------------------------------
 Tue Mar 13 13:26:04 CST 2007 - maw@suse.de
 
diff --git a/nautilus.spec b/nautilus.spec
index cd31740..a98ff2b 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package nautilus (Version 2.17.91)
+# spec file for package nautilus (Version 2.18.0.1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,10 +11,11 @@
 # norootforbuild
 
 Name:           nautilus
-BuildRequires:  cdparanoia eel-devel gnome-common gnome-icon-theme gnome-patch-translation intltool libbeagle-devel libexif-devel libgnomeui-devel libidl librsvg-devel mDNSResponder-devel perl-XML-Parser update-desktop-files
+# BuildRequires:  cdparanoia eel-devel gnome-common gnome-icon-theme gnome-patch-translation intltool libbeagle-devel libexif-devel libgnomeui-devel libidl librsvg-devel mDNSResponder-devel perl-XML-Parser update-desktop-files
+BuildRequires:  cdparanoia eel-devel gnome-common gnome-icon-theme gnome-patch-translation intltool libbeagle-devel libgnomeui-devel libidl librsvg-devel mDNSResponder-devel perl-XML-Parser update-desktop-files
 License:        GNU General Public License (GPL)
 Group:          Productivity/File utilities
-Version:        2.17.91
+Version:        2.18.0.1
 Release:        1
 Summary:        The GNOME 2.x Desktop File Manager
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.16/%{name}-%{version}.tar.bz2
@@ -173,6 +174,12 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Mar 22 2007 - maw@suse.de
+- Update to version 2.18.0.1
+- intltool is now a build requirement
+- Several code cleanups
+- Bug fixes, including p.g.o 408155, 333151, 358172, 408155,
+  409276, 407150, 407618, and 368661.
 * Tue Mar 13 2007 - maw@suse.de
 - Update to version 2.17.91
 - Bug fixes, including bugzilla.gnome.org #364466, #403255,