diff --git a/nasm.spec b/nasm.spec
index c9be35f..21ec8ee 100644
--- a/nasm.spec
+++ b/nasm.spec
@@ -2,7 +2,7 @@
 Summary: A portable x86 assembler which uses Intel-like syntax
 Name: nasm
 Version: 2.07
-Release: 2%{?dist}
+Release: 3%{?dist}
 # No version specified.
 License: LGPLv2+
 Group: Development/Languages
@@ -58,10 +58,12 @@ install -t $RPM_BUILD_ROOT/%{_infodir} doc/info/*
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/nasm.info.gz  %{_infodir}/dir || :
+if [ -e %{_infodir}/nasm.info.gz ]; then
+  /sbin/install-info %{_infodir}/nasm.info.gz  %{_infodir}/dir || :
+fi
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -e %{_infodir}/nasm.info.gz ]; then
   /sbin/install-info --delete %{_infodir}/nasm.info.gz %{_infodir}/dir || :
 fi
 
@@ -90,6 +92,9 @@ fi
 %{_bindir}/rdf2srec
 
 %changelog
+* Thu Aug 20 2009 Zdenek Prikryl <zprikryl@redhat.com> - 2.07-3
+- Don't complain if installing with --excludedocs (#515944)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.07-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild