diff --git a/gdm-2.17.7.tar.bz2 b/gdm-2.17.7.tar.bz2
deleted file mode 100644
index 1ce82d8..0000000
--- a/gdm-2.17.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8377abb7adc0a2a0fb9eeb1bd8256a9ec907506d22359a9a8b28d3e56b5ab222
-size 3322848
diff --git a/gdm-2.18.0.tar.bz2 b/gdm-2.18.0.tar.bz2
new file mode 100644
index 0000000..28e3af1
--- /dev/null
+++ b/gdm-2.18.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6619ef1ba04f4408f181b1a6c1d8a86f791706e22e0e2803153dbd5554a18053
+size 3461709
diff --git a/gdm-conf-custom-sysconfig.patch b/gdm-conf-custom-sysconfig.patch
index 648a27f..c35b369 100644
--- a/gdm-conf-custom-sysconfig.patch
+++ b/gdm-conf-custom-sysconfig.patch
@@ -1,6 +1,8 @@
---- config/gdm.conf-custom
-+++ config/gdm.conf-custom
-@@ -37,6 +37,12 @@
+Index: config/gdm.conf-custom.in
+===================================================================
+--- config/gdm.conf-custom.in.orig
++++ config/gdm.conf-custom.in
+@@ -50,6 +50,12 @@
  #
  # NOTE: Lines that begin with "#" are considered comments.
  #
diff --git a/gdm-gdmsetup-rootonly.patch b/gdm-gdmsetup-rootonly.patch
index 50d4cb3..4816be3 100644
--- a/gdm-gdmsetup-rootonly.patch
+++ b/gdm-gdmsetup-rootonly.patch
@@ -1,9 +1,11 @@
---- gui/gdmsetup.desktop.in.in
+Index: gui/gdmsetup.desktop.in.in
+===================================================================
+--- gui/gdmsetup.desktop.in.in.orig
 +++ gui/gdmsetup.desktop.in.in
-@@ -5,6 +5,7 @@
- _Comment=Configure the login window (GNOME Display Manager)
+@@ -4,6 +4,7 @@ _Name=Login Window
+ _Comment=Configure GDM login window appearance and behavior
  TryExec=@sbindir@/gdmsetup
- Exec=gdmsetup
+ Exec=@sbindir@/gdmsetup
 +X-KDE-RootOnly=true
  Icon=gdm-setup
  StartupNotify=true
diff --git a/gdm-gdmsetup.patch b/gdm-gdmsetup.patch
index b365c71..bf3188a 100644
--- a/gdm-gdmsetup.patch
+++ b/gdm-gdmsetup.patch
@@ -8,6 +8,6 @@ Index: gui/gdmsetup.desktop.in.in
  _Comment=Configure GDM login window appearance and behavior
 -TryExec=@sbindir@/gdmsetup
 +TryExec=gdmsetup
- Exec=gdmsetup
+ Exec=@sbindir@/gdmsetup
  X-KDE-RootOnly=true
  Icon=gdm-setup
diff --git a/gdm-trunk-string-literal-cmp.patch b/gdm-trunk-string-literal-cmp.patch
deleted file mode 100644
index ef1ba3b..0000000
--- a/gdm-trunk-string-literal-cmp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gui/gdmdynamic.c
-===================================================================
---- gui/gdmdynamic.c	(revision 4590)
-+++ gui/gdmdynamic.c	(working copy)
-@@ -153,7 +153,7 @@ main (int argc, char *argv[])
-     }
- 
-     /* process remaining option arguments for -l */
--    if (command == GDM_SUP_ATTACHED_SERVERS)
-+    if (command != NULL && strcmp (command, GDM_SUP_ATTACHED_SERVERS) == 0)
-         for (; optind<argc; optind++)
-             params = argv[optind];
- 
diff --git a/gdm.changes b/gdm.changes
index ba08ce9..47cc81b 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 30 15:39:19 CST 2007 - maw@suse.de
+
+- Update to version 2.18.0
+- b.g.o 415513, 417350, 415181, 409801, 409693, 406226, and 407687. 
+
 -------------------------------------------------------------------
 Fri Mar 30 13:13:21 CEST 2007 - aj@suse.de
 
diff --git a/gdm.spec b/gdm.spec
index a585962..6c79bf2 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gdm (Version 2.17.7)
+# spec file for package gdm (Version 2.18.0)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -24,8 +24,8 @@ PreReq:         %insserv_prereq
 License:        GNU General Public License (GPL)
 Group:          System/GUI/GNOME
 Autoreqprov:    on
-Version:        2.17.7
-Release:        6
+Version:        2.18.0
+Release:        1
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gdm.pamd
@@ -53,7 +53,6 @@ Patch26:        gdm-2.8.0.7-some-info-in-dialog.patch
 Patch28:        gdm-X_SERVER.patch
 Patch29:        gdm-gdmsetup.patch
 Patch30:        gdm-conf-custom-sysconfig.patch
-Patch32:        gdm-trunk-string-literal-cmp.patch
 Patch33:        gdm-2.13.0.4-audit-login.patch
 Patch34:        gdm-2.17.7-vt-fallback.patch
 URL:            http://www.gnome.org/
@@ -105,7 +104,6 @@ gnome-patch-translation-prepare
 %patch28
 %patch29
 %patch30
-%patch32
 %patch33 -p1
 %patch34 -p1
 gnome-patch-translation-update
@@ -232,6 +230,9 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 %endif
 
 %changelog
+* Fri Mar 30 2007 - maw@suse.de
+- Update to version 2.18.0
+- b.g.o 415513, 417350, 415181, 409801, 409693, 406226, and 407687.
 * Fri Mar 30 2007 - aj@suse.de
 - Add pwdutils to BuildRequires.
 * Wed Mar 21 2007 - hpj@suse.de