diff --git a/sendmail.init b/sendmail.init
index 3e78577..c33e89c 100644
--- a/sendmail.init
+++ b/sendmail.init
@@ -38,7 +38,7 @@ start() {
 	echo -n $"Starting $prog: "
 	/usr/bin/newaliases > /dev/null 2>&1
 	if test -x /usr/bin/make -a -f /etc/mail/Makefile ; then
-	  make -C /etc/mail -s
+	  make all -C /etc/mail -s
 	else
 	  for i in virtusertable access domaintable mailertable ; do
 	    if [ -f /etc/mail/$i ] ; then
diff --git a/sendmail.spec b/sendmail.spec
index be2d503..f377cc8 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -2,8 +2,8 @@
 # If you want to build this on older Red Hat Linux releases, this defines
 # the version number to build on. Supported should be 62 70 71 72 for
 # Red Hat Linux 6.2 up to 7.2 and "100" for the current rawhide version.
-%define errata 100
-%define release 15
+%define errata 73
+%define release 25
 
 %if %{errata} <= 70
 %define sendmailcf usr/lib/sendmail-cf
@@ -37,6 +37,9 @@ Patch3: sendmail-8.10.0-smrsh-paths.patch
 Patch4: sendmail-8.10.1-movefiles.patch
 Patch5: sendmail-8.12.2-unix.patch
 Patch6: sendmail-8.11.6-localdomain.patch
+Patch7: sendmail-8.11.6-smrsh.patch
+Patch8: sendmail-8.11.6-sec.patch
+Patch9: sendmail-8.11.6-security.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: gdbm-devel
 %if %{errata} > 62
@@ -45,20 +48,23 @@ BuildRequires: cyrus-sasl
 %else
 BuildRequires: cyrus-sasl-devel
 %endif
+%if %{errata} >= 73
+BuildRequires: hesiod-devel
+%endif
 BuildRequires: db3-devel
 BuildRequires: openldap-devel tcp_wrappers
 %endif
-%if %{errata} == 100
+%if %{errata} >= 73
 Prereq: /usr/sbin/alternatives
-Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz %{_mandir}/man1/newaliases.1.gz %{_mandir}/man5/aliases.5.gz
+Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
+Provides: %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz
+Provides: %{_mandir}/man1/newaliases.1.gz %{_mandir}/man5/aliases.5.gz
 Prereq: chkconfig >= 1.3
 %else
 Prereq: /sbin/chkconfig
-%endif
-Prereq: /usr/sbin/useradd /bin/mktemp fileutils gawk sed sh-utils
-%if %{errata} < 100
 Conflicts: postfix exim
 %endif
+Prereq: /usr/sbin/useradd /bin/mktemp fileutils gawk sed sh-utils
 Requires: procmail
 %if %{errata} > 62
 Requires: bash >= 2.0
@@ -115,6 +121,9 @@ your sendmail.cf file.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 pushd libmilter
@@ -263,7 +272,7 @@ install -m 755 -d $RPM_BUILD_ROOT%{_libdir}
 install -m 644  $OBJDIR/libmilter/libmilter.a $RPM_BUILD_ROOT%{_libdir}
 install -m 644  $OBJDIR/libsmutil/libsmutil.a $RPM_BUILD_ROOT%{_libdir}
 
-%if %{errata} == 100
+%if %{errata} >= 73
 mv $RPM_BUILD_ROOT%{_sbindir}/sendmail $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail
 for i in mailq newaliases rmail; do
 	mv $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_bindir}/$i.sendmail
@@ -308,7 +317,7 @@ done
 
 /sbin/chkconfig --add sendmail
 
-%if %{errata} == 100
+%if %{errata} >= 73
 #
 # Set up the alternatives files for MTAs.
 #
@@ -351,7 +360,7 @@ fi
 if [ $1 = 0 ]; then
    %{initdir}/sendmail stop >/dev/null 2>&1
    /sbin/chkconfig --del sendmail
-%if %{errata} == 100
+%if %{errata} >= 73
    /usr/sbin/alternatives --remove mta %{_sbindir}/sendmail.sendmail
 %endif
 fi
@@ -360,7 +369,7 @@ exit 0
 %triggerpostun -- sendmail < 8.10.0
 /sbin/chkconfig --add sendmail
 
-%if %{errata} == 100
+%if %{errata} >= 73
 %triggerpostun -- sendmail < 8.11.6-11
 /usr/sbin/alternatives --auto mta
 %endif
@@ -373,7 +382,7 @@ exit 0
 /usr/bin/purgestat
 /usr/bin/makemap
 /usr/sbin/makemap
-%if %{errata} == 100
+%if %{errata} >= 73
 /usr/bin/rmail.sendmail
 /usr/sbin/sendmail.sendmail
 /usr/bin/newaliases.sendmail
@@ -393,7 +402,7 @@ exit 0
 %{_mandir}/man8/makemap.8*
 %{_mandir}/man8/sendmail.8*
 %{_mandir}/man8/smrsh.8*
-%if %{errata} == 100
+%if %{errata} >= 73
 %{_mandir}/man5/aliases.sendmail.5*
 %{_mandir}/man1/newaliases.sendmail.1*
 %{_mandir}/man1/mailq.sendmail.1*
@@ -453,6 +462,19 @@ exit 0
 %{_docdir}/sendmail
 
 %changelog
+* Wed Mar 26 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- add another security patch
+- use target "all" if invoking make
+
+* Mon Feb 24 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- add another fix to sendmail
+- prepare for combined RHL7.x and RHL AS 2.1 release
+- check spec file to match 8.12.x version if possible
+- fix alternatives to work for 7.3 errata
+
+* Mon Nov 04 2002 Phil Knirsch <pknirsch@redhat.com>
+- Security fix for smrsh.
+
 * Mon Apr 08 2002 Florian La Roche <Florian.LaRoche@redhat.de>
 - handel "localhost.localdomain" case  #54188