diff --git a/units.spec b/units.spec
index 3dbf9f7..4d7b1a6 100644
--- a/units.spec
+++ b/units.spec
@@ -1,7 +1,7 @@
 Summary: A utility for converting amounts from one unit to another
 Name: units
 Version: 1.87
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
 URL: http://www.gnu.org/software/units/units.html
 License: GPLv2+
@@ -35,14 +35,14 @@ gzip $RPM_BUILD_ROOT%{_infodir}/units.info
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/units.info.gz %{_infodir}/dir
-exit 0
+if [ -e %{_infodir}/units.info.gz ]; then
+  /sbin/install-info %{_infodir}/units.info.gz %{_infodir}/dir || :
+fi
 
 %preun
-if [ "$1" = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/units.info.gz %{_infodir}/dir
+if [ $1 = 0 -a -e %{_infodir}/units.info.gz ]; then
+  /sbin/install-info --delete %{_infodir}/units.info.gz %{_infodir}/dir || :
 fi
-exit 0
 
 %files
 %defattr(-,root,root)
@@ -53,6 +53,9 @@ exit 0
 %{_mandir}/man1/*
 
 %changelog
+* Thu Aug 20 2009 Zdenek Prikryl <zprikryl@redhat.com> - 1.87-5
+- Don't complain if installing with --excludedocs (#515941)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.87-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild