diff --git a/ChangeLog b/ChangeLog
index 77d725f8d5..07d0042030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/updateiconcache.c (write_card16, write_card32): Avoid
+	unaligned access.  (#172947)
+
+	* gtk/gtkfilechooserdefault.c (file_list_build_popup_menu): 
+	Consistently use the term "Bookmarks" in the UI.  (#166906,
+	Sebastian Bacher)
+
 	Some fixes from Morten Welinder (#172947):
 	
 	* gtk/updateiconcache.c (icon_name_hash): Make this compiler- 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 77d725f8d5..07d0042030 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/updateiconcache.c (write_card16, write_card32): Avoid
+	unaligned access.  (#172947)
+
+	* gtk/gtkfilechooserdefault.c (file_list_build_popup_menu): 
+	Consistently use the term "Bookmarks" in the UI.  (#166906,
+	Sebastian Bacher)
+
 	Some fixes from Morten Welinder (#172947):
 	
 	* gtk/updateiconcache.c (icon_name_hash): Make this compiler- 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 77d725f8d5..07d0042030 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,12 @@
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/updateiconcache.c (write_card16, write_card32): Avoid
+	unaligned access.  (#172947)
+
+	* gtk/gtkfilechooserdefault.c (file_list_build_popup_menu): 
+	Consistently use the term "Bookmarks" in the UI.  (#166906,
+	Sebastian Bacher)
+
 	Some fixes from Morten Welinder (#172947):
 	
 	* gtk/updateiconcache.c (icon_name_hash): Make this compiler- 
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 9ff07dece6..174b3c9f5e 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3184,7 +3184,7 @@ shortcuts_pane_create (GtkFileChooserDefault *impl,
 						  G_CALLBACK (add_bookmark_button_clicked_cb));
   gtk_box_pack_start (GTK_BOX (hbox), impl->browse_shortcuts_add_button, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (impl->tooltips, impl->browse_shortcuts_add_button,
-                        _("Add the selected folder to the bookmarks"), NULL);
+                        _("Add the selected folder to the Bookmarks"), NULL);
 
   /* Remove bookmark button */
 
@@ -3259,7 +3259,7 @@ popup_menu_detach_cb (GtkWidget *attach_widget,
   impl->browse_files_popup_menu_hidden_files_item = NULL;
 }
 
-/* Callback used when the "Add to Shortcuts" menu item is activated */
+/* Callback used when the "Add to Bookmarks" menu item is activated */
 static void
 add_to_shortcuts_cb (GtkMenuItem           *item,
 		     GtkFileChooserDefault *impl)
@@ -3299,7 +3299,7 @@ file_list_build_popup_menu (GtkFileChooserDefault *impl)
 			     impl->browse_files_tree_view,
 			     popup_menu_detach_cb);
 
-  item = gtk_image_menu_item_new_with_mnemonic (_("_Add to Shortcuts"));
+  item = gtk_image_menu_item_new_with_mnemonic (_("_Add to Bookmarks"));
   impl->browse_files_popup_menu_add_shortcut_item = item;
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
 				 gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
@@ -3335,7 +3335,7 @@ file_list_update_popup_menu (GtkFileChooserDefault *impl)
 {
   file_list_build_popup_menu (impl);
 
-  /* The sensitivity of the Add to Shortcuts item is set in
+  /* The sensitivity of the Add to Bookmarks item is set in
    * bookmarks_check_add_sensitivity()
    */
 
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index d7e8867b52..8662166659 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -443,11 +443,10 @@ gboolean
 write_card16 (FILE *cache, guint16 n)
 {
   int i;
-  gchar s[2];
 
-  *((guint16 *)s) = GUINT16_TO_BE (n);
+  n = GUINT16_TO_BE (n);
   
-  i = fwrite (s, 2, 1, cache);
+  i = fwrite ((char *)&n, 2, 1, cache);
 
   return i == 1;
 }
@@ -456,11 +455,10 @@ gboolean
 write_card32 (FILE *cache, guint32 n)
 {
   int i;
-  gchar s[4];
 
-  *((guint32 *)s) = GUINT32_TO_BE (n);
+  n = GUINT32_TO_BE (n);
   
-  i = fwrite (s, 4, 1, cache);
+  i = fwrite ((char *)&n, 4, 1, cache);
 
   return i == 1;
 }