diff --git a/gnome-panel.spec b/gnome-panel.spec
index 678a043..e3e0b47 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.22.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2
 
@@ -120,6 +120,7 @@ Patch26: expose.patch
 Patch27: populate.patch
 Patch28: gnome-panel-larger-find-window.patch
 Patch29: set-time-window.patch
+Patch30: location-edit.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -173,6 +174,7 @@ Panel Applets using the libpanel-applet library.
 %patch27 -p1 -b .populate
 %patch28 -p1 -b .larger-find-window
 %patch29 -p1 -b .set-time-window
+%patch30 -p1 -b .location-edit
 
 . %{SOURCE6}
 
@@ -357,6 +359,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Mar 28 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-8
+- Fix editing of locations in the clock applet
+
 * Fri Mar 28 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-7
 - Convert the edit and find location windows to dialogs
 
diff --git a/location-edit.patch b/location-edit.patch
new file mode 100644
index 0000000..012423f
--- /dev/null
+++ b/location-edit.patch
@@ -0,0 +1,17 @@
+diff -up gnome-panel-2.22.0/applets/clock/clock.c.location-edit gnome-panel-2.22.0/applets/clock/clock.c
+--- gnome-panel-2.22.0/applets/clock/clock.c.location-edit	2008-03-28 11:25:10.000000000 -0400
++++ gnome-panel-2.22.0/applets/clock/clock.c	2008-03-28 11:25:16.000000000 -0400
+@@ -1003,6 +1003,13 @@ create_cities_store (ClockData *cd)
+ 
+                 list = list->next;
+ 	}
++
++	 
++	if (cd->prefs_window) { 	 
++		GtkWidget *widget = glade_xml_get_widget (cd->glade_xml, "cities_list"); 	 
++		gtk_tree_view_set_model (GTK_TREE_VIEW (widget), 	 
++		GTK_TREE_MODEL (cd->cities_store)); 	 
++	}
+ }
+ 
+ static gint