diff --git a/ChangeLog b/ChangeLog
index f82f64393b..e8d0d497a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-02  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* tools/Makefile.am:
+	* tools/gst-launch.1.in:
+	  Don't create a customised man page based on the host architecture,
+	  describe the default registry path generically. That way the man
+	  page is the same for all architectures and packagers have one
+	  multilib issue less to deal with. Fixes #434926.
+
 2007-05-02  Wim Taymans  <wim@fluendo.com>
 
 	* gst/gstpad.c:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e8544dc662..e383cb9711 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -134,6 +134,5 @@ EXTRA_DIST = \
 		-e s,gst-xmlinspect,gst-xmlinspect-@GST_MAJORMINOR@,g \
 		-e s,gst-xmllaunch,gst-xmllaunch-@GST_MAJORMINOR@,g \
 		-e s,GST_MAJORMINOR,@GST_MAJORMINOR@,g \
-		-e s,HOST_CPU,@HOST_CPU@,g \
 		$< >$@
 
diff --git a/tools/gst-launch.1.in b/tools/gst-launch.1.in
index bf903fa415..c9c1c9babf 100644
--- a/tools/gst-launch.1.in
+++ b/tools/gst-launch.1.in
@@ -1,4 +1,4 @@
-.TH "GStreamer" "1" "December 2005"
+.TH "GStreamer" "1" "May 2007"
 .SH "NAME"
 gst\-launch \- build and run a GStreamer pipeline
 .SH "SYNOPSIS"
@@ -390,7 +390,10 @@ GST_DEBUG=totem:4,typefind:5
 When this environment variable is set, coloured debug output is disabled.
 .TP
 \fBGST_REGISTRY\fR
-Path of the registry file. Default is ~/.gstreamer-GST_MAJORMINOR/registry-HOST_CPU.xml.
+Path of the plugin registry file. Default is
+~/.gstreamer-GST_MAJORMINOR/registry-CPU.xml where CPU is the machine/cpu type
+GStreamer was compiled for, e.g. 'i486', 'i686', 'x86-64', 'ppc', etc. (check
+the output of "uname -i" and "uname -m" for details).
 .TP
 \fBGST_PLUGIN_PATH\fR
 Specifies a list of directories to scan for additional plugins.