diff --git a/sendmail.etc-mail-Makefile b/sendmail.etc-mail-Makefile
index e2f2fad..e5b531d 100644
--- a/sendmail.etc-mail-Makefile
+++ b/sendmail.etc-mail-Makefile
@@ -11,13 +11,13 @@ CFFILES   = sendmail.cf submit.cf
 
 all: ${CFFILES} ${POSSIBLE} virtusertable.db access.db domaintable.db mailertable.db
 
-userdb.db : userdb
+userdb.db: userdb
 	@makemap btree $@ < $<
 
-%.db : %
+%.db: %
 	@makemap hash $@ < $<
 
-%.cf : %.mc
+%.cf: %.mc
 	@if test -f /usr/share/sendmail-cf/m4/cf.m4; then \
 		mv -f $@ $@.bak; \
 		m4 $< > $@; \
@@ -26,3 +26,12 @@ userdb.db : userdb
 clean:
 	rm -f *.db *~
 
+start:
+	service sendmail start
+
+stop:
+	service sendmail stop
+
+restart:
+	service sendmail restart
+
diff --git a/sendmail.init b/sendmail.init
index d994243..dafa761 100644
--- a/sendmail.init
+++ b/sendmail.init
@@ -40,7 +40,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 98e9a20..87140ff 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 4
+%define errata 90
+%define release 5
 
 %if %{errata} <= 70
 %define sendmailcf usr/lib/sendmail-cf
@@ -46,22 +46,21 @@ Patch5: sendmail-8.12.2-movefiles.patch
 Patch7: sendmail-8.12.5-pid.patch
 Patch9: sendmail-8.12.7-hesiod.patch
 Patch10: sendmail-8.12.7-manpage.patch
+Patch11: sendmail-8.12.8-security.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: gdbm-devel
 %if %{errata} > 62
-%if %{errata} <= 70
-BuildRequires: cyrus-sasl
-%else
-BuildRequires: cyrus-sasl-devel
+# RHL7.0 only had cyrus-sasl, but an errata also provides cyrus-sasl-devel
+BuildRequires: openldap-devel, openssl-devel, tcp_wrappers, cyrus-sasl-devel
 %endif
-%if %{errata} >= 73
-BuildRequires: hesiod-devel
-%else
+%if %{errata} <= 73
 BuildRequires: db3-devel
 %endif
-BuildRequires: openldap-devel, openssl-devel, tcp_wrappers
+%if %{errata} >= 80
+BuildRequires: db4-devel
 %endif
 %if %{errata} >= 73
+BuildRequires: hesiod-devel
 Prereq: /usr/sbin/alternatives
 Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
 Provides: %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz
@@ -131,14 +130,20 @@ fi
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 %ifarch s390
 export RPM_OPT_FLAGS="-O1"
 %endif
 
+if test %{errata} -gt 72 ; then
 sed	-e 's,%%{_libdir},%{_libdir},g' \
 	-e 's,%%{_lib},%{_lib},g' redhat.config.m4.in > redhat.config.m4
+fi
+if test %{errata} = 73 ; then
+	perl -pi -e 's,-ldb-4.0,-ldb,g' redhat.config.m4
+fi
 
 for i in libmilter libsmutil sendmail mailstats rmail praliases \
 	smrsh makemap ; do
@@ -495,6 +500,16 @@ exit 0
 %{_docdir}/sendmail
 
 %changelog
+* Wed Mar 26 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- call make with the target "all" #86005
+- add start/stop/restart as Makefile targets
+- add another security patch
+
+* Wed Mar 05 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- add correct db4-devel requirements for newer releases
+- completely re-do many ifdef code in the spec-file
+- fix some issues building for older RHL releases
+
 * Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>
 - rebuilt