diff --git a/gtk-gui.c b/gtk-gui.c
index 90476306b..167fac162 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -726,11 +726,11 @@ static GtkWidget * map_provider_widget()
 
 	/* several of the providers seem to be redundant or non-functional;
 	 * we may have to skip more than just the last three eventually */
-	for (i = OSM_GPS_MAP_SOURCE_OPENSTREETMAP; i < OSM_GPS_MAP_SOURCE_LAST; i++)
+	for (i = OSM_GPS_MAP_SOURCE_OPENSTREETMAP; i <= OSM_GPS_MAP_SOURCE_YAHOO_STREET; i++)
 		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combobox), osm_gps_map_source_get_friendly_name(i));
 #else
 	GtkWidget *combobox = gtk_combo_box_new_text();
-	for (i = OSM_GPS_MAP_SOURCE_OPENSTREETMAP; i < OSM_GPS_MAP_SOURCE_LAST; i++)
+	for (i = OSM_GPS_MAP_SOURCE_OPENSTREETMAP; i <= OSM_GPS_MAP_SOURCE_YAHOO_STREET; i++)
 		gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), osm_gps_map_source_get_friendly_name(i));
 #endif
 	/* we don't offer choice 0 (none), so the index here is off by one */