diff --git a/glib2.changes b/glib2.changes
index 8f9fb71..a53fb0f 100644
--- a/glib2.changes
+++ b/glib2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug  9 16:45:39 CEST 2007 - sbrabec@suse.cz
+
+- Removed gtk-doc from BuildRequires and included required
+  gtk-doc.m4 to Sources (preprocessed docs are now included, this
+  shortens bootstrap compilation path).
+
 -------------------------------------------------------------------
 Wed Aug  8 17:49:41 CEST 2007 - maw@suse.de
 
diff --git a/glib2.spec b/glib2.spec
index b088985..dfd1624 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -12,17 +12,20 @@
 
 Name:           glib2
 %define _name glib
-BuildRequires:  fdupes gtk-doc pkg-config
+BuildRequires:  fdupes pkg-config
 License:        LGPL v2 or later
 Group:          Development/Libraries/C and C++
 Autoreqprov:    on
 Version:        2.13.7
-Release:        7
+Release:        8
 Summary:        A Library with Convenient Functions Written in C
 URL:            http://www.gtk.org/
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.13/%{_name}-%{version}.tar.bz2
 Source1:        glib2.sh
 Source2:        glib2.csh
+# Not depending on gtk-doc shortens bootstrap compilation path.
+# Please update this file from the latest gtk-doc package:
+Source3:        gtk-doc.m4
 Patch0:         glib-mkinstalldirs.patch
 Patch1:         glib-aclocal.patch
 Patch2:         glib-cast.patch
@@ -121,6 +124,9 @@ Authors:
 %patch0
 %patch1
 %patch2
+if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
+    cp -a %{S:3} m4macros/
+fi
 
 %build
 autoreconf -f -i
@@ -139,11 +145,9 @@ cp -a %{S:2} $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.csh
 
 %fdupes $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -172,8 +176,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_datadir}/gtk-doc/html/glib
 %{_datadir}/gtk-doc/html/gobject
+# Own these repositories to not depend on gtk-doc while building:
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
 
 %changelog
+* Thu Aug 09 2007 - sbrabec@suse.cz
+- Removed gtk-doc from BuildRequires and included required
+  gtk-doc.m4 to Sources (preprocessed docs are now included, this
+  shortens bootstrap compilation path).
 * Wed Aug 08 2007 - maw@suse.de
 - Use %%fdupes
 - Split off a -lang subpackage
diff --git a/gtk-doc.m4 b/gtk-doc.m4
new file mode 100644
index 0000000..2e69090
--- /dev/null
+++ b/gtk-doc.m4
@@ -0,0 +1,53 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+  dnl for overriding the documentation installation directory
+  AC_ARG_WITH(html-dir,
+    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+    [with_html_dir='${datadir}/gtk-doc/html'])
+  HTML_DIR="$with_html_dir"
+  AC_SUBST(HTML_DIR)
+
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE(gtk-doc,
+    AC_HELP_STRING([--enable-gtk-doc],
+                   [use gtk-doc to build documentation [default=no]]),,
+    enable_gtk_doc=no)
+
+  have_gtk_doc=no
+  if test x$enable_gtk_doc = xyes; then
+    if test -z "$PKG_CONFIG"; then
+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+    fi
+    if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
+      have_gtk_doc=yes
+    fi
+
+  dnl do we want to do a version check?
+ifelse([$1],[],,
+    [gtk_doc_min_version=$1
+    if test "$have_gtk_doc" = yes; then
+      AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
+      if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
+        AC_MSG_RESULT(yes)
+      else
+        AC_MSG_RESULT(no)
+        have_gtk_doc=no
+      fi
+    fi
+])
+    if test "$have_gtk_doc" != yes; then
+      enable_gtk_doc=no
+    fi
+  fi
+
+  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
+])