diff --git a/gphoto2.spec b/gphoto2.spec
index 944a481..6c85b26 100644
--- a/gphoto2.spec
+++ b/gphoto2.spec
@@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.gz
 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.gz
 Patch1: gphoto2-hotplug.patch
+Patch2: gphoto2-gcc4.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 # For /etc/hotplug/usb..
@@ -69,11 +70,12 @@ use libgphoto2.
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .hotplug
+%patch2 -p1 -b .gcc4
 
 ####################################
 %build
 pushd %{libpkg}-%{libver}
-%configure --disable-rpath --enable-docs \
+%configure --disable-rpath --disable-docs \
 	--with-doc-dir=%{buildroot}%{_docdir}/%{name}
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
@@ -89,7 +91,7 @@ cat $(pwd)/libgphoto2-%{libver}/libgphoto2/libgphoto2.pc | sed \
   -e "s,^Cflags:.*$,Cflags: -I\${includedir}/$gp_path -I\${includedir}," \
   > libgphoto2.pc
 export PKG_CONFIG_PATH=.
-%configure --enable-docs --with-doc-dir=%{buildroot}%{_docdir}/%{name}
+%configure --disable-docs --with-doc-dir=%{buildroot}%{_docdir}/%{name}
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
 
@@ -198,6 +200,10 @@ fi
 # ChangeLog
 ########################################################################
 %changelog
+* Fri Mar 11 2005 Tim Waugh <twaugh@redhat.com>
+- Rebuild with GCC 4 fixes.
+- Disable docs again until gtk-doc is fixed (GNOME bug #169087).
+
 * Fri Mar  4 2005 Tim Waugh <twaugh@redhat.com>
 - Re-enable docs.