diff --git a/0002-Improved-indicator-background-handling.patch b/0002-Improved-indicator-background-handling.patch
new file mode 100644
index 0000000..391bded
--- /dev/null
+++ b/0002-Improved-indicator-background-handling.patch
@@ -0,0 +1,40 @@
+From f152783de4f4dc82d757468dfc738d12390ffcbc Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov <svu@gnome.org>
+Date: Thu, 8 Oct 2009 22:52:42 +0100
+Subject: [PATCH 2/2] Improved indicator background handling
+
+https://bugzilla.gnome.org/show_bug.cgi?id=587510
+---
+ ChangeLog                    |    3 +++
+ libgnomekbd/gkbd-indicator.c |    1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 574753e..3d4a437 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -3,6 +3,9 @@
+ 	* libgnomekbd/gkbd-keyboard-drawing.c,
+ 	libgnomekbd/gkbd-keyboard-drawing.h: properly handling keycodes with
+ 	multiple keys, https://bugzilla.gnome.org/show_bug.cgi?id=590954
++	* libgnomekbd/gkbd-indicator.c: improved background handling by making
++	event box invisible
++	https://bugzilla.gnome.org/show_bug.cgi?id=587510
+ 
+ 2009-09-14 svu
+ 
+diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
+index 0b43f85..2fb388a 100644
+--- a/libgnomekbd/gkbd-indicator.c
++++ b/libgnomekbd/gkbd-indicator.c
+@@ -217,6 +217,7 @@ gkbd_indicator_prepare_drawing (GkbdIndicator * gki, int group)
+ 
+ 	pimage = g_slist_nth_data (globals.ind_cfg.images, group);
+ 	ebox = gtk_event_box_new ();
++	gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE);
+ 	if (globals.ind_cfg.show_flags) {
+ 		GtkWidget *flag;
+ 		if (pimage == NULL)
+-- 
+1.6.5.rc2
+
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index ccd9990..e1c4d95 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:       	2.28.0
-Release:        1%{?dist}
+Version:        2.28.0
+Release:        3%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -27,6 +27,10 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
+# upstream fixes
+Patch0: 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch
+Patch1: 0002-Improved-indicator-background-handling.patch
+
 %description
 The libgnomekbd package contains a GNOME library which manages
 keyboard configuration and offers various widgets related to
@@ -47,18 +51,20 @@ The libgnomekbd-devel package contains libraries and header files for
 developing applications that use libgnomekbd.
 
 
-%package	capplet
-Summary:	A configuration applet to select libgnomekbd plugins
-Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+%package        capplet
+Summary:        A configuration applet to select libgnomekbd plugins
+Group:          User Interface/Desktops
+Requires:       %{name} = %{version}-%{release}
 
-%description	capplet
+%description    capplet
 The libgnomekbd-capplet package contains a configuration applet to
 select libgnomekbd plugins. These plugins can modify the appearance
 of the keyboard indicator applet.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multiple-keys
+%patch1 -p1 -b .indicator-background
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -123,11 +129,18 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_libdir}/pkgconfig/*
 
 %files capplet
+%defattr(-,root,root,-)
 %{_bindir}/gkbd-indicator-plugins-capplet
 %{_datadir}/applications/gnome-gkbd-indicator-plugins-capplet.desktop
 
 
 %changelog
+* Thu Dec  3 2009 Matthias Clasen <mclasen@redhat.com> - 2.28.0-3
+- Small spec fixes
+
+* Thu Oct  8 2009 Matthias Clasen <mclasen@redhat.com> - 2.28.0-2
+- Incorporate visual fixes from upstream
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen@redhat.com> - 2.28.0-1
 - Update to 2.28.0