--- Makefile.am	1999-01-20 18:47:56.000000000 +0100
+++ Makefile.am.oden	2006-01-08 07:41:55.000000000 +0100
@@ -2,7 +2,7 @@
 PACKAGE_VERSION=@PACKAGE@-@VERSION@
 # i can do that better ...
 AUTOMAKE_OPTIONS=no-dependencies ansi2knr readme-alpha 1.3 gnu
-man_MANS=smtpblast.1 usmtpd.1 tomaildir.1 maildirblast.1 rewriteheader.1
+man_MANS=smtpblast.1 tomaildir.1 maildirblast.1 rewriteheader.1
 EXTRA_DIST= attribs.h crc32ansi.h dirsysdep.h dns.h dynhash.h \
 	dns_int.h filelock.h \
 	mtalib.h maildirblast.h nomktime.h qmail_emul.h relaydb.h \
@@ -12,7 +12,7 @@
 	inet_aton.c memcmp.c \
 	Specfile.in rpmrc buildrpm systype.in \
 	$(man_MANS) uostr.3 \
-	README README.smtpblast README.usmtpd README.tomaildir README.cvs TODO
+	README README.smtpblast README.tomaildir README.cvs TODO
 
 noinst_LIBRARIES=libmta.a libdns.a libstr.a libio.a
 libmta_a_SOURCES=mta.c mta_qq.c mta_maildir.c mta_get.c str_ulong.c
@@ -21,7 +21,6 @@
 libio_a_SOURCES=uoio.c uoio_cstrmu.c uoio_write_v.c uoio_gd_uos.c
 
 bin_PROGRAMS=smtpblast tomaildir maildirblast mkmail rewriteheader
-sbin_PROGRAMS=usmtpd
 mkmail_SOURCES=mkmail.c uogetopt.c str2long.c str2ulong.c str_ulong.c
 mkmail_LDADD=libstr.a libio.a
 rewriteheader_SOURCES=rewriteheader.c uogetopt.c str2long.c str2ulong.c str_ulong.c strdupsubw.c strdupsub.c \
@@ -32,10 +31,6 @@
 smtpblast_SOURCES=smtpblast.c smtp.c logmsg.c \
 	nonblock.c uosock_connect.c filelock.c uogetopt.c str2long.c str2ulong.c
 smtpblast_LDADD=libdns.a libmta.a libstr.a libio.a @LIBOBJS@
-usmtpd_SOURCES=usmtpd.c uogetopt.c str2long.c str2ulong.c \
-	logmsg.c relaydb.c crc32ansi.c \
-	dynhash.c nomktime.c 
-usmtpd_LDADD=libdns.a libmta.a libstr.a libio.a @LIBOBJS@
 maildirblast_SOURCES=maildirblast.c smtp.c runqueue.c \
 	logmsg.c nonblock.c \
 	uosock_connect.c filelock.c uogetopt.c str2long.c str2ulong.c