diff --git a/ChangeLog b/ChangeLog
index 164dc2f05..90daddbfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-20  Carl Worth  <cworth@cworth.org>
+
+	* Makefile.am: Force distcheck to enable gtk-doc.
+
 2005-06-20  Carl Worth  <cworth@cworth.org>
 
 	* NEWS: Added notes for snapshot 0.5.1
diff --git a/Makefile.am b/Makefile.am
index 60ae80514..31aea9118 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,8 @@ EXTRA_DIST = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = cairo.pc
 
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+
 # Some custom targets to make it easier to release things.
 # Use either:
 #		make release-check
diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml
index f6a827c70..992ace500 100644
--- a/doc/public/tmpl/cairo.sgml
+++ b/doc/public/tmpl/cairo.sgml
@@ -977,25 +977,6 @@ Drawing contexts.
 @Returns: 
 
 
-<!-- ##### USER_FUNCTION cairo_error_notify_func_t ##### -->
-<para>
-
-</para>
-
-@closure: 
-@status: 
-
-
-<!-- ##### FUNCTION cairo_set_error_notify ##### -->
-<para>
-
-</para>
-
-@cr: 
-@error_notify: 
-@closure: 
-
-
 <!-- ##### ENUM cairo_filter_t ##### -->
 <para>