diff --git a/m4.spec b/m4.spec
index 7b3f7c4..ccf15f0 100644
--- a/m4.spec
+++ b/m4.spec
@@ -1,14 +1,15 @@
 Summary: The GNU macro processor.
 Name: m4
 Version: 1.4.5
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2
 Source1: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2.sig
 URL: http://www.gnu.org/software/m4/
 Buildroot: %{_tmppath}/%{name}-root
-Prereq: /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 A GNU implementation of the traditional UNIX macro processor.  M4 is
@@ -21,8 +22,6 @@ not for running configure scripts.
 Install m4 if you need a macro processor.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q
 
 %build
@@ -30,6 +29,8 @@ rm -rf $RPM_BUILD_ROOT
 make
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -41,17 +42,21 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %{_mandir}/man1/m4.1*
 
 %post
-/sbin/install-info %{_infodir}/m4.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/m4.info %{_infodir}/dir || :
 
 %preun
 if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/m4.info.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/m4.info %{_infodir}/dir || :
 fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 17 2006 Miloslav Trmac <mitr@redhat.com> - 1.4.5-3
+- Use the install-info scriptlets recommended in the Fedora Extras wiki
+- Move $RPM_BUILD_ROOT cleaning from %%prep to %%install
+
 * Mon Jul 17 2006 Tomas Mraz <tmraz@redhat.com> - 1.4.5-2
 - remove infodir/dir so it isn't included in the package