diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index d5dfd7d7e4..97c716abf3 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,9 @@
 2007-06-25  Matthias Clasen <mclasen@redhat.com>
 
+	* gtk/Makefile.am:
+	* gtk/gtk-builder-convert.xml: Add a man page
+	* gtk/gtk-docs.sgml: And include it here
+
 	* gtk/tmpl/gtkscalebutton.sgml:
 	* gtk/tmpl/gtkvolumebutton.sgml:
 	* gtk/tmpl/gtkvscrollbar.sgml:
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index ffe8f15d68..1e7daa44ef 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -69,6 +69,7 @@ IGNORE_HFILES=				\
 	gtksearchenginebeagle.h		\
 	gtksearchenginetracker.h	\
 	gtksearchenginesimple.h		\
+	gtksearchenginequartz.h		\
 	gtksequence.h			\
 	gtksocketprivate.h		\
 	gtktextbtree.h			\
@@ -144,6 +145,7 @@ content_files =					\
 	x11.sgml				\
 	gtk-query-immodules-2.0.xml		\
 	gtk-update-icon-cache.xml		\
+	gtk-builder-convert.xml			\
 	visual_index.xml
 
 expand_content_files = 				\
@@ -333,7 +335,7 @@ EXTRA_DIST += version.xml.in
 
 ########################################################################
 
-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 
+man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
 
 if ENABLE_MAN
 
diff --git a/docs/reference/gtk/gtk-builder-convert.1 b/docs/reference/gtk/gtk-builder-convert.1
new file mode 100644
index 0000000000..222a0711ad
--- /dev/null
+++ b/docs/reference/gtk/gtk-builder-convert.1
@@ -0,0 +1,30 @@
+.\"     Title: gtk-builder-convert
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+.\"      Date: 06/26/2007
+.\"    Manual: 
+.\"    Source: 
+.\"
+.TH "GTK\-BUILDER\-CONVERT" "1" "06/26/2007" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+gtk\-builder\-convert \- Glade file conversion utility
+.SH "SYNOPSIS"
+.HP 25
+\fBgtk\-builder\-convert \fR\fB{file}\fR
+.SH "DESCRIPTION"
+.PP
+\fBgtk\-builder\-convert\fR
+converts glade files into XML files which can be loaded with GtkBuilder.
+.PP
+It expects the name of a glade file as sole argument, and writes its output to stdout.
+.SH "BUGS"
+.PP
+GtkComboBox items are not converted into GtkListStore data.
+.PP
+GtkTextView text is not converted into a GtkTextBuffer.
+.PP
+Toolbars are not handled.
diff --git a/docs/reference/gtk/gtk-builder-convert.xml b/docs/reference/gtk/gtk-builder-convert.xml
new file mode 100644
index 0000000000..5afb9a08cb
--- /dev/null
+++ b/docs/reference/gtk/gtk-builder-convert.xml
@@ -0,0 +1,41 @@
+<refentry id="gtk-builder-convert">
+
+<refmeta>
+<refentrytitle>gtk-builder-convert</refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>gtk-builder-convert</refname>
+<refpurpose>Glade file conversion utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk-builder-convert <arg choice="req">file</arg></command>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para><command>gtk-builder-convert</command> converts glade files
+into XML files which can be loaded with GtkBuilder.
+</para>
+<para>
+It expects the name of a glade file as sole argument, and writes
+its output to stdout.
+</para>
+</refsect1>
+
+<refsect1><title>Bugs</title>
+<para>
+GtkComboBox items are not converted into GtkListStore data.
+</para>
+<para>
+GtkTextView text is not converted into a GtkTextBuffer.
+</para>
+<para>
+Toolbars are not handled.
+</para>
+</refsect1>
+
+</refentry>
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index b530992f09..fe5e0dae82 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -228,6 +228,7 @@
 <!ENTITY version SYSTEM "version.xml">
 <!ENTITY gtk-query-immodules SYSTEM "gtk-query-immodules-2.0.xml">
 <!ENTITY gtk-update-icon-cache SYSTEM "gtk-update-icon-cache.xml">
+<!ENTITY gtk-builder-convert SYSTEM "gtk-builder-convert.xml">
 <!ENTITY gtk-glossary SYSTEM "xml/glossary.xml">
 ]>
 <book id="index">
@@ -650,6 +651,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
 
      &gtk-query-immodules;
      &gtk-update-icon-cache;
+     &gtk-builder-convert;
   </part>
 
   &gtk-glossary;
@@ -678,5 +680,4 @@ that is, GUI components such as #GtkButton or #GtkTextView.
   <index role="2.12">
     <title>Index of new symbols in 2.12</title>
   </index>  
-
 </book>