diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8f2e0e472d..18d589cf08 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,7 +17,7 @@ bin_PROGRAMS = 	gst-launch 	\
 		gst-complete
 
 man_MANS = gst-launch.1 gst-register.1 gst-inspect.1 \
-	gst-complete.1 gst-compprep.1
+	gst-complete.1 gst-compprep.1 gst-xmllaunch.1
 
 gst_launch_LDADD = $(GST_LIBS) #-lefence
 gst_launch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" 
diff --git a/tools/gst-complete.1 b/tools/gst-complete.1
index b687705251..9ff831579b 100644
--- a/tools/gst-complete.1
+++ b/tools/gst-complete.1
@@ -22,10 +22,9 @@ In your .bash_profile or other appropriate place, run
 .TP 8
 .B  complete -C gst\-complete gst\-launch
 .SH SEE ALSO
-.BR gst\-compreg (1),
-.BR gst\-lanuch (1),
+.BR gst\-compprep (1),
+.BR gst\-launch (1),
 .BR gst\-register (1),
 .BR gst\-inspect (1),
-.BR gst\-config (1)
 .SH AUTHOR
 The GStreamer team at http://gstreamer.net/
diff --git a/tools/gst-compprep.1 b/tools/gst-compprep.1
index 0f60bcb17f..e4cd75f920 100644
--- a/tools/gst-compprep.1
+++ b/tools/gst-compprep.1
@@ -23,6 +23,5 @@ Registry generated by \fIgst\-compprep\fP and used by \fIgst\-complete\fP.
 .BR gst\-launch (1),
 .BR gst\-register (1),
 .BR gst\-inspect (1),
-.BR gst\-config (1)
 .SH "AUTHOR"
 The GStreamer team at http://gstreamer.net/
diff --git a/tools/gst-inspect.1 b/tools/gst-inspect.1
index 9f8d6edc11..40601e4e79 100644
--- a/tools/gst-inspect.1
+++ b/tools/gst-inspect.1
@@ -39,7 +39,6 @@ Enable printout of errors while loading \fIGStreamer\fP plugins
 .B  \-\-gst\-plugin\-path=PATH
 Add directories separated with ':' to the plugin search path
 .SH SEE ALSO
-.BR gst\-config (1),
 .BR gst\-register (1),
 .BR gst\-launch (1)
 .SH AUTHOR
diff --git a/tools/gst-launch.1 b/tools/gst-launch.1
index e578b54273..485360385b 100644
--- a/tools/gst-launch.1
+++ b/tools/gst-launch.1
@@ -109,6 +109,5 @@ Add directories separated with ':' to the plugin search path
 .BR gst\-complete (1),
 .BR gst\-register (1),
 .BR gst\-inspect (1),
-.BR gst\-config (1)
 .SH "AUTHOR"
 The GStreamer team at http://gstreamer.net/
diff --git a/tools/gst-register.1 b/tools/gst-register.1
index 95cdee2ca7..c29c2d71c5 100644
--- a/tools/gst-register.1
+++ b/tools/gst-register.1
@@ -33,9 +33,8 @@ Enable printout of errors while loading \fIGStreamer\fP plugins
 .B  \-\-gst\-plugin\-path=PATH
 Add directories separated with ':' to the plugin search path
 .SH SEE ALSO
-.BR gst\-config (1),
 .BR gst\-inspect (1),
 .BR gst\-launch (1),
-.BR gst\-compreg (1)
+.BR gst\-compprep (1)
 .SH AUTHOR
 The GStreamer team at http://gstreamer.net/
diff --git a/tools/gst-xmllaunch.1 b/tools/gst-xmllaunch.1
new file mode 100644
index 0000000000..661a72a7f1
--- /dev/null
+++ b/tools/gst-xmllaunch.1
@@ -0,0 +1,52 @@
+.TH "GStreamer" "1" "March 2001"
+.SH "NAME"
+gst\-xmllaunch \- build and run a GStreamer pipeline from an XML serialization
+.SH "SYNOPSIS"
+\fBgst\-xmllaunch\fR \fI[OPTION...]\fR XML\-FILE [ ELEMENT.PROPERTY=VALUE ... ]
+.SH "DESCRIPTION"
+.LP 
+\fIgst\-xmllaunch\fP is a tool that is used to build and run a basic
+\fIGStreamer\fP pipeline, loading it from an XML description. You can
+produce the XML description using gst-launch(1) with the -o option or by
+calling gst_xml_write_file() in your own app.
+
+A simple commandline looks like:
+
+ gst\-xmllaunch my\-pipeline.xml filesrc0.location=music.mp3
+
+This sets the location property of the element named filesrc0 to the value
+"music.mp3". See gst\-launch(1) for syntax on setting element names, and
+gst\-inspect to see what properties various elements have.
+
+You can pass "-" as the XML\-FILE to read from stdin.
+
+.
+.SH "OPTIONS"
+.l
+\fIgst\-xmllaunch\fP accepts the following options:
+.TP 8
+.B  \-\-help
+Print help synopsis and available FLAGS
+.TP 8
+.B  \-\-gst\-info\-mask=FLAGS
+\fIGStreamer\fP info flags to set (list with \-\-help)
+.TP 8
+.B  \-\-gst\-debug\-mask=FLAGS
+\fIGStreamer\fP debugging flags to set (list with \-\-help)
+.TP 8
+.B  \-\-gst\-mask=FLAGS
+\fIGStreamer\fP info and debugging flags to set (list with \-\-help)
+.TP 8
+.B  \-\-gst\-plugin\-spew
+\fIGStreamer\fP info flags to set
+Enable printout of errors while loading \fIGStreamer\fP plugins
+.TP 8
+.B  \-\-gst\-plugin\-path=PATH
+Add directories separated with ':' to the plugin search path
+.SH "SEE ALSO"
+.BR gst\-guilaunch (1),
+.BR gst\-launch (1),
+.BR gst\-register (1),
+.BR gst\-inspect (1),
+.SH "AUTHOR"
+The GStreamer team at http://gstreamer.net/