diff --git a/ChangeLog b/ChangeLog
index d86b360f7b..75c685060b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-16  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/gst.c: (init_post):
+	  make the registry cache file HOST_CPU-dependent
+
 2005-12-16  Andy Wingo  <wingo@pobox.com>
 
 	* plugins/elements/gstbufferstore.c
diff --git a/common b/common
index 4edc214072..14377200cc 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 4edc214072fe07d2aade96bc336493425654d7b4
+Subproject commit 14377200ccbba1f366ce2c2746c8cd70f61b9840
diff --git a/docs/faq/gst-uninstalled b/docs/faq/gst-uninstalled
index 6187641e36..592e469a8b 100755
--- a/docs/faq/gst-uninstalled
+++ b/docs/faq/gst-uninstalled
@@ -64,7 +64,7 @@ shell=$SHELL
 if test "x$SHELL" == "x/bin/bash"
 then
   # debian/ubuntu resets our PS1.  bastards.
-  shell="$SHELL --norc --noprofile"
+  shell="$SHELL --noprofile"
 fi
 PS1="[gst-$VERSION] $PS1" $shell
 
diff --git a/gst/gst.c b/gst/gst.c
index 9584519304..7c71b1dd09 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -589,7 +589,7 @@ init_post (void)
     registry_file = g_strdup (g_getenv ("GST_REGISTRY"));
     if (registry_file == NULL) {
       registry_file = g_build_filename (g_get_home_dir (),
-          ".gstreamer-" GST_MAJORMINOR, "registry.xml", NULL);
+          ".gstreamer-" GST_MAJORMINOR, "registry." HOST_CPU ".xml", NULL);
     }
     GST_DEBUG ("Reading registry cache");
     gst_registry_xml_read_cache (default_registry, registry_file);