diff --git a/ed.spec b/ed.spec
index ce15f7b..2f902af 100644
--- a/ed.spec
+++ b/ed.spec
@@ -1,13 +1,14 @@
-Summary: The GNU line editor.
+Summary: The GNU line editor
 Name: ed
 Version: 0.4
-Release: 2
+Release: 3
 License: GPL
-Group:	Applications/Text
+Group:  Applications/Text
 Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.bz2
-URL: 	http://www.gnu.org/software/ed/
-Prereq: /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-root
+URL:    http://www.gnu.org/software/ed/
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 
 %description
@@ -29,13 +30,14 @@ rm -f stamp-h.in
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-%makeinstall bindir=$RPM_BUILD_ROOT/bin \
-	mandir=$RPM_BUILD_ROOT%{_mandir}/man1
+make install DESTDIR=$RPM_BUILD_ROOT \
+    bindir=/bin mandir=%{_mandir}/man1
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir*
 gzip -9qnf  $RPM_BUILD_ROOT%{_infodir}/*
-install doc/ed.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m0644 doc/ed.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %post
 /sbin/install-info %{_infodir}/ed.info.gz %{_infodir}/dir --entry="* ed: (ed).                  The GNU Line Editor." || :
@@ -53,9 +55,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog NEWS README TODO AUTHORS COPYING
 /bin/*
 %{_infodir}/ed.info.gz
-%attr(0644,root,root) %{_mandir}/*/*
+%{_mandir}/*/*
 
 %changelog
+* Mon Feb 05 2007 Karsten Hopp <karsten@redhat.com> 0.4-3
+- clean up spec file for merge review (#225717)
+
 * Wed Jan 31 2007 Karsten Hopp <karsten@redhat.com> 0.4-2
 - use RPM_OPT_FLAGS, this fixes debuginfo
 
@@ -165,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 - rebuild to gzip man pages.
 
 * Tue Mar 23 1999 Jeff Johnson <jbj@redhat.com>
-- fix %post syntax error (#1689).
+- fix %%post syntax error (#1689).
 
 * Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
 - auto rebuild in the new build environment (release 11)