diff --git a/.cvsignore b/.cvsignore
index 46ddb64..1b325fd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,4 @@ libgphoto2-2.1.6.tar.gz
 gphoto2-2.1.6.tar.gz
 libgphoto2-2.1.99.tar.bz2
 gphoto2-2.1.99.tar.bz2
+gphoto2-2.1.99-installed-doc.tar.bz2
diff --git a/gphoto2.spec b/gphoto2.spec
index f0f4053..5d98198 100644
--- a/gphoto2.spec
+++ b/gphoto2.spec
@@ -5,13 +5,13 @@ Name: gphoto2
 %define libpkg libgphoto2
 %define libver 2.1.99
 Version: %{pkgver}
-Release: 10.1
+Release: 11
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2
-#Source2: gen-libgphoto-hal-fdi
+Source2: gphoto2-2.1.99-installed-doc.tar.bz2
 Source3: 90-gphoto-camera-policy.fdi
 Source4: gphoto-set-procperm
 Patch2: gphoto2-gcc4.patch
@@ -74,7 +74,7 @@ use libgphoto2.
 
 ####################################
 %prep
-%setup -q -a 1
+%setup -q -a 1 -a 2
 %patch2 -p1 -b .gcc4
 %patch3 -p1 -b .dbus
 %patch4 -p1 -b .segv
@@ -84,13 +84,14 @@ use libgphoto2.
 
 ####################################
 %build
+mv -f installed-doc ${RPM_BUILD_ROOT}
+
 pushd %{libpkg}-%{libver}
 export CFLAGS=$RPM_OPT_FLAGS
 %configure \
 	--mandir=%{_mandir} \
 	--libdir=%{_libdir} \
 	--with-drivers=all \
-	--enable-docs \
 	--with-doc-dir=%{_docdir}/%{name} \
 	--disable-static
 
@@ -144,10 +145,11 @@ make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
 install -d -m755 $RPM_BUILD_ROOT%{_libexecdir}/
 install -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/gphoto-set-procperm
 
+# not building them - bug in gtk-doc
 mv -f %{buildroot}%{_docdir}/%{name} installed-doc
-mv -f %{buildroot}/%{name} installed-doc
-mv -f %{buildroot}/%{name}-port installed-doc
-mv -f %{buildroot}/canon installed-doc
+#mv -f %{buildroot}/%{name} installed-doc
+#mv -f %{buildroot}/%{name}-port installed-doc
+#mv -f %{buildroot}/canon installed-doc
 find installed-doc -name '*.sgml' | xargs -r rm
 
 rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
@@ -220,6 +222,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 # ChangeLog
 ########################################################################
 %changelog
+* Thu May 18 2006 Radek Vokál <rvokal@redhat.com> 2.1.99-11
+- include docs on side, disable compiling them (bug in gtk-doc!?)
+
 * Tue Apr 04 2006 Radek Vokál <rvokal@redhat.com> 2.1.99-10
 - fix crash in ptp2 module
 
diff --git a/sources b/sources
index 3b944f4..afd8f08 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 3c6d9cb65661915e07491a6f9215d5a9  libgphoto2-2.1.99.tar.bz2
 549a9dfae6910ab6456b194ea86b55a2  gphoto2-2.1.99.tar.bz2
+584e1fca2dd1e6cd210d59f7944c8ebd  gphoto2-2.1.99-installed-doc.tar.bz2