diff --git a/docs/reference/gtk/tmpl/.gitignore b/docs/reference/gtk/tmpl/.gitignore
index d33890a96d..4b829a2eeb 100644
--- a/docs/reference/gtk/tmpl/.gitignore
+++ b/docs/reference/gtk/tmpl/.gitignore
@@ -31,6 +31,7 @@ gtkexpander.sgml
 gtkfeatures.sgml
 gtkfixed.sgml
 gtkfilefilter.sgml
+gtkfontbutton.sgml
 gtkhbox.sgml
 gtkhpaned.sgml
 gtkiconview.sgml
diff --git a/docs/reference/gtk/tmpl/gtkfontbutton.sgml b/docs/reference/gtk/tmpl/gtkfontbutton.sgml
deleted file mode 100644
index ca8253d7cf..0000000000
--- a/docs/reference/gtk/tmpl/gtkfontbutton.sgml
+++ /dev/null
@@ -1,194 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkFontButton
-
-<!-- ##### SECTION Short_Description ##### -->
-A button to launch a font selection dialog
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkFontButton is a button which displays the currently selected font an allows to open a font selection 
-dialog to change the font. It is suitable widget for selecting a font in a preference dialog.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkFontSelectionDialog, #GtkColorButton.
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkFontButton ##### -->
-<para>
-The GtkFontButton struct has only private members and should not be used
-directly.
-</para>
-
-
-<!-- ##### SIGNAL GtkFontButton::font-set ##### -->
-<para>
-
-</para>
-
-@fontbutton: the object which received the signal.
-
-<!-- ##### ARG GtkFontButton:font-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:show-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:show-style ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:use-font ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:use-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_font_button_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_new_with_font ##### -->
-<para>
-
-</para>
-
-@fontname: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_font_name ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@fontname: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_font_name ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_show_style ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@show_style: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_show_style ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_show_size ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@show_size: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_show_size ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_use_font ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@use_font: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_use_font ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_use_size ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@use_size: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_use_size ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_title ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@title: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_title ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 1f6c7b1b42..0cd08f4521 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -45,6 +45,18 @@
 #include <stdio.h>
 
 
+/**
+ * SECTION:gtkfontbutton
+ * @Short_description: A button to launch a font selection dialog
+ * @Title: GtkFontButton
+ * @See_also: #GtkFontSelectionDialog, #GtkColorButton.
+ *
+ * The #GtkFontButton is a button which displays the currently selected
+ * font an allows to open a font selection dialog to change the font.
+ * It is suitable widget for selecting a font in a preference dialog.
+ */
+
+
 struct _GtkFontButtonPrivate 
 {
   gchar         *title;