diff --git a/src/etc/mail/Makefile b/src/etc/mail/Makefile
index 646c6a54..83d3f9eb 100644
--- a/src/etc/mail/Makefile
+++ b/src/etc/mail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/06/24 18:27:45 tom Exp $
+# $OpenBSD: Makefile,v 1.4 2004/08/14 17:06:03 millert Exp $
 #
 # Generate the various .db versions from their source files.
 # The sendmail .mc files are not built here.  They live in
@@ -31,6 +31,9 @@ distribution:
 	    -O DontBlameSendmail=mapinunsafedirpath
 	${INSTALL} -c -o root -g wheel -m 644 local-host-names \
 	    ${DESTDIR}/etc/mail/local-host-names
+	${INSTALL} -c -o root -g wheel -m 644 genericstable \
+	    ${DESTDIR}/etc/mail/genericstable
+	makemap hash ${DESTDIR}/etc/mail/genericstable < genericstable
 	${INSTALL} -c -o root -g wheel -m 644 mailertable \
 	    ${DESTDIR}/etc/mail/mailertable
 	makemap hash ${DESTDIR}/etc/mail/mailertable < mailertable
@@ -41,7 +44,8 @@ distribution:
 	${INSTALL} -c -o root -g wheel -m 644 virtusertable \
 	    ${DESTDIR}/etc/mail/virtusertable
 	makemap hash ${DESTDIR}/etc/mail/virtusertable < virtusertable
-	@for db in access.db aliases.db mailertable.db virtusertable.db; do \
+	@for db in access.db aliases.db genericstable.db mailertable.db \
+	    virtusertable.db; do \
 		chmod 644 ${DESTDIR}/etc/mail/$$db; \
 	done
 
diff --git a/src/etc/mail/genericstable b/src/etc/mail/genericstable
new file mode 100644
index 00000000..441b801a
--- /dev/null
+++ b/src/etc/mail/genericstable
@@ -0,0 +1,28 @@
+# $OpenBSD: genericstable,v 1.1 2004/08/14 17:06:03 millert Exp $
+#
+# sendmail(8) generics table.  Rebuild by running as root:
+#   makemap hash /etc/mail/genericstable < /etc/mail/genericstable
+#
+# This file contains the mapping of local to external addresses.
+# It is often used to map login names to First.Last name style
+# email addresses.
+#
+# Each line denotes a transform of:
+#   local_address	external_address
+#
+# Where local_address is usually unqualified.
+#
+# E.g.
+#   peter		Peter.Parker@bugle.com
+#
+# It is also possible to rewrite non-local address from one or more
+# domains using the GENERICS_DOMAIN or GENERICS_DOMAIN_FILE macros.
+# This is usally used on an outgoing mail hub to rewrite addresses
+# from different subsidiaries or departments to include the parent
+# domain (in addition to the First.Last name mapping).  E.g.
+#
+#   joe@dept.company.com	Joe.Bloggs@company.com
+#
+# See the "genericstable" section of /usr/share/sendmail/README for
+# more information.
+#