diff --git a/rpy.spec b/rpy.spec
index 4f3576b..0babea7 100644
--- a/rpy.spec
+++ b/rpy.spec
@@ -3,16 +3,20 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+Patch1:         rpy-install-info.patch
 License:	GPL
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel
+BuildRequires:	R, python-numeric, python-devel, texinfo
+
 Requires:	python-numeric
 Requires:	R = 2.2.1
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 RPy provides a robust Python interface to the R
@@ -22,28 +26,50 @@ converted to Python exceptions.
 
 %prep
 %setup
+%patch1 -p1 -b .install-info
 
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
-
+cd doc
+makeinfo --html manual.texi
+makeinfo --html manual.texi
+mv rpy manual
+make pdf
+make info
 
 %install
 rm -rf $RPM_BUILD_ROOT
 python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
-
+cd doc
+install -d $RPM_BUILD_ROOT/%{_infodir}
+install rpy.info $RPM_BUILD_ROOT/%{_infodir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
 
 %files
 %defattr(-,root,root)
-%doc COPYING NEWS README examples/ doc/
+%doc COPYING NEWS README examples/
+%doc doc/manual.pdf doc/manual/
+%{_infodir}/rpy.info*
 %{python_sitearch}/*
 
 
 %changelog
+* Fri Feb 17 2006 Alex Lancaster <alexl@users.sourceforge.net> - 0.4.6-7
+- Build info docs (bz#169002).
+- Build pdf and html documentation, clean doc directory. (jamatos)
+
 * Thu Feb 16 2006 José Matos <jamatos@fc.up.pt> - 0.4.6-6
 - Use a fixed value for R version.