diff --git a/.cvsignore b/.cvsignore
index 975c875..1f349db 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-libgnomekbd-2.17.2.tar.bz2
-m4.tar.gz
+libgnomekbd-2.18.0.tar.bz2
diff --git a/libgnomekbd-2.18.0-rotated-text.patch b/libgnomekbd-2.18.0-rotated-text.patch
new file mode 100644
index 0000000..e402fdb
--- /dev/null
+++ b/libgnomekbd-2.18.0-rotated-text.patch
@@ -0,0 +1,49 @@
+--- libgnomekbd-2.18.0/libgnomekbd/gkbd-keyboard-drawing.c.rotated-text	2007-02-03 20:30:49.000000000 -0500
++++ libgnomekbd-2.18.0/libgnomekbd/gkbd-keyboard-drawing.c	2007-03-13 18:24:54.000000000 -0400
+@@ -470,9 +470,6 @@
+ 	     gint angle, gint x, gint y, PangoLayout * layout)
+ {
+ 	GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing));
+-	PangoLayoutLine *line;
+-	gint x_off, y_off;
+-	gint i;
+ 
+ 	if (drawing->pixmap == NULL)
+ 		return;
+@@ -486,36 +483,6 @@
+ 		drawing->angle = angle;
+ 	}
+ 
+-	i = 0;
+-	y_off = 0;
+-	for (line = pango_layout_get_line (drawing->layout, i);
+-	     line != NULL;
+-	     line = pango_layout_get_line (drawing->layout, ++i)) {
+-		GSList *runp;
+-		PangoRectangle line_extents;
+-
+-		x_off = 0;
+-
+-		for (runp = line->runs; runp != NULL; runp = runp->next) {
+-			PangoGlyphItem *run = runp->data;
+-			gint j;
+-
+-			for (j = 0; j < run->glyphs->num_glyphs; j++) {
+-				PangoGlyphGeometry *geometry;
+-
+-				geometry =
+-				    &run->glyphs->glyphs[j].geometry;
+-
+-				x_off += geometry->width;
+-			}
+-		}
+-
+-		pango_layout_line_get_extents (line, NULL, &line_extents);
+-		y_off +=
+-		    line_extents.height +
+-		    pango_layout_get_spacing (drawing->layout);
+-	}
+-
+ 	gdk_draw_layout (drawing->pixmap,
+ 			 GTK_WIDGET (drawing)->style->text_gc[state], x, y,
+ 			 drawing->layout);
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index e8d321d..a2319c9 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,17 +1,16 @@
 Name:           libgnomekbd
-Version:       	2.17.2
-Release:        2%{?dist}
+Version:       	2.18.0
+Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://gswitchit.sourceforce.net
-Source0:        libgnomekbd-%{version}.tar.bz2
-Source1:        m4.tar.gz
+Source0:        http://ftp.gnome.org/pub/gnome/sources/libgnomekbd/2.18/libgnomekbd-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=365590
 Patch1:         libgnomekbd-0.1-werror.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=352777
-Patch2:		libgnomekbd-2.17.2-rotated-text.patch
+Patch2:		libgnomekbd-2.18.0-rotated-text.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=352778
 Patch3:	        libgnomekbd-2.17.2-label-color.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=352779
@@ -30,7 +29,7 @@ BuildRequires:  libgnome-devel >= 2.16.0
 BuildRequires:  libgnomeui-devel >= 2.16.0
 BuildRequires:  libxklavier-devel >= 2.91
 BuildRequires:  desktop-file-utils
-BuildRequires:  perl-XML-Parser
+BuildRequires:  perl(XML::Parser)
 BuildRequires:  gettext
 
 Requires(pre): GConf2
@@ -66,8 +65,6 @@ developing applications that use libgnomekbd.
 %patch4 -p1 -b .corner
 %patch5 -p1 -b .redraw
 
-tar xzf %{SOURCE1}
-
 %build
 %configure --disable-static --enable-compile-warnings=no
 make %{?_smp_mflags}
@@ -95,6 +92,8 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas >& /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %pre
@@ -113,6 +112,8 @@ fi
 
 %postun 
 /sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %files -f %{name}.lang
@@ -123,7 +124,7 @@ fi
 %{_bindir}/gkbd-indicator-plugins-capplet
 %{_datadir}/applications/gnome-gkbd-indicator-plugins-capplet.desktop
 %{_datadir}/libgnomekbd
-
+%{_datadir}/icons/hicolor/48x48/apps/gkbd-indicator-plugins-capplet.png
 
 %files devel
 %defattr(-,root,root,-)
@@ -133,6 +134,9 @@ fi
 
 
 %changelog
+* Tue Mar 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.0-1
+- Update to 2.18.0
+
 * Wed Jan 24 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.2-2
 - Port former control-center patches to improve keyboard drawing
 
diff --git a/sources b/sources
index 9510474..942a768 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-11fab9889d8923842d6101f1c9e23fea  libgnomekbd-2.17.2.tar.bz2
-7eaabea494a68e16bf7ce84014ecef96  m4.tar.gz
+f176e026158f678144511fb343ec7269  libgnomekbd-2.18.0.tar.bz2