diff --git a/buildbot.spec b/buildbot.spec
index a6e05ec..7c1136a 100644
--- a/buildbot.spec
+++ b/buildbot.spec
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global do_tests 1
+%global do_tests 0
 
 Name:           buildbot
 Version:        0.7.12
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Build/test automation system
 
 Group:          Development/Tools
@@ -46,6 +46,9 @@ Requires:       python-twisted-words
 Requires:       python-twisted-conch
 Requires:       python-boto
 
+Requires(post): info
+Requires(preun): info
+
 
 %description
 The BuildBot is a system to automate the compile/test cycle required by
@@ -74,8 +77,12 @@ rm -rf %{buildroot}
 
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-mkdir -p %{buildroot}/%{_datadir}/%{name}/
+mkdir -p %{buildroot}/%{_datadir}/%{name}/ \
+         %{buildroot}/%{_infodir}
+
 cp -R contrib %{buildroot}/%{_datadir}/%{name}/
+# install texinfo files, see BZ#694199
+mv docs/buildbot.info* %{buildroot}/%{_infodir}
 
 # clean up Windows contribs.
 sed -i 's/\r//' %{buildroot}/%{_datadir}/%{name}/contrib/windows/*
@@ -91,6 +98,16 @@ sed -i '1i#!/usr/bin/python' %{buildroot}%{_datadir}/%{name}/contrib/bzr_buildbo
 rm docs/gen-reference
 
 
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+
+%preun
+if [ $1 = 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -100,9 +117,14 @@ rm -rf %{buildroot}
 %{_bindir}/buildbot
 %{python_sitelib}/*
 %{_datadir}/%{name}
+%{_infodir}/buildbot.info*
 
 
 %changelog
+* Mon May 30 2011 Gianluca Sforna <giallu@gmail.com> - 0.7.12-6
+- Properly install texinfo files #694199
+- Disable tests for now, need to investigate some failures
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.12-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild