diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 9360bd352749..ba36f7524262 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.132 1999/01/06 13:55:09 peter Exp $
+ * $Id: dist.c,v 1.133 1999/02/04 03:30:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -109,7 +109,6 @@ static Distribution SrcDistTable[] = {
 { "ssys",	"/usr/src",		&SrcDists,	DIST_SRC_SYS,		NULL		},
 { "subin",	"/usr/src",		&SrcDists,	DIST_SRC_UBIN,		NULL		},
 { "susbin",	"/usr/src",		&SrcDists,	DIST_SRC_USBIN,		NULL		},
-{ "ssmailcf",	"/usr/src",		&SrcDists,	DIST_SRC_SMAILCF,	NULL		},
 { NULL },
 };
 
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index 47fd21f7a1e6..ae388506efb1 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -22,10 +22,10 @@
 
 /* Canned distribution sets */
 #define _DIST_DEVELOPER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC | DIST_COMPAT22)
 
 #define _DIST_USER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT22)
 
 /* Subtypes for DES distribution */
 #define DIST_DES_DES		0x0001
@@ -51,8 +51,7 @@
 #define DIST_SRC_UBIN		0x02000
 #define DIST_SRC_USBIN		0x04000
 #define DIST_SRC_BIN		0x08000
-#define DIST_SRC_SMAILCF	0x10000
-#define DIST_SRC_ALL		0xFFFF	/* no SMAILCF, it's part of USBIN */
+#define DIST_SRC_ALL		0xFFFF
 
 /* Subtypes for XFree86 distribution */
 #define DIST_XF86_BIN		0x0001
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 9eb4d5794fd0..fafca206274e 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.186 1999/02/06 08:45:20 jkh Exp $
+ * $Id: menus.c,v 1.187 1999/02/06 16:35:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -41,7 +41,7 @@ static int
 setSrc(dialogMenuItem *self)
 {
     Dists |= DIST_SRC;
-    SrcDists = DIST_SRC_ALL | DIST_SRC_SMAILCF;
+    SrcDists = DIST_SRC_ALL;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -837,8 +837,6 @@ DMenu MenuSrcDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
       { "usbin",	"/usr/src/usr.sbin (aux system binaries)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN },
-      { "smailcf",	"/usr/src/usr.sbin (sendmail config macros)",
-	dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
       { "All",		"Select all of the above",
 	NULL,		setSrc, NULL, NULL, ' ', ' ', ' ' },
       { "Clear",	"Reset all of the above",
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 9eb4d5794fd0..fafca206274e 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.186 1999/02/06 08:45:20 jkh Exp $
+ * $Id: menus.c,v 1.187 1999/02/06 16:35:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -41,7 +41,7 @@ static int
 setSrc(dialogMenuItem *self)
 {
     Dists |= DIST_SRC;
-    SrcDists = DIST_SRC_ALL | DIST_SRC_SMAILCF;
+    SrcDists = DIST_SRC_ALL;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -837,8 +837,6 @@ DMenu MenuSrcDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
       { "usbin",	"/usr/src/usr.sbin (aux system binaries)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN },
-      { "smailcf",	"/usr/src/usr.sbin (sendmail config macros)",
-	dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
       { "All",		"Select all of the above",
 	NULL,		setSrc, NULL, NULL, ' ', ' ', ' ' },
       { "Clear",	"Reset all of the above",
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 9360bd352749..ba36f7524262 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.132 1999/01/06 13:55:09 peter Exp $
+ * $Id: dist.c,v 1.133 1999/02/04 03:30:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -109,7 +109,6 @@ static Distribution SrcDistTable[] = {
 { "ssys",	"/usr/src",		&SrcDists,	DIST_SRC_SYS,		NULL		},
 { "subin",	"/usr/src",		&SrcDists,	DIST_SRC_UBIN,		NULL		},
 { "susbin",	"/usr/src",		&SrcDists,	DIST_SRC_USBIN,		NULL		},
-{ "ssmailcf",	"/usr/src",		&SrcDists,	DIST_SRC_SMAILCF,	NULL		},
 { NULL },
 };
 
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 47fd21f7a1e6..ae388506efb1 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -22,10 +22,10 @@
 
 /* Canned distribution sets */
 #define _DIST_DEVELOPER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC | DIST_COMPAT22)
 
 #define _DIST_USER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT22)
 
 /* Subtypes for DES distribution */
 #define DIST_DES_DES		0x0001
@@ -51,8 +51,7 @@
 #define DIST_SRC_UBIN		0x02000
 #define DIST_SRC_USBIN		0x04000
 #define DIST_SRC_BIN		0x08000
-#define DIST_SRC_SMAILCF	0x10000
-#define DIST_SRC_ALL		0xFFFF	/* no SMAILCF, it's part of USBIN */
+#define DIST_SRC_ALL		0xFFFF
 
 /* Subtypes for XFree86 distribution */
 #define DIST_XF86_BIN		0x0001
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 9eb4d5794fd0..fafca206274e 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.186 1999/02/06 08:45:20 jkh Exp $
+ * $Id: menus.c,v 1.187 1999/02/06 16:35:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -41,7 +41,7 @@ static int
 setSrc(dialogMenuItem *self)
 {
     Dists |= DIST_SRC;
-    SrcDists = DIST_SRC_ALL | DIST_SRC_SMAILCF;
+    SrcDists = DIST_SRC_ALL;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -837,8 +837,6 @@ DMenu MenuSrcDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
       { "usbin",	"/usr/src/usr.sbin (aux system binaries)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN },
-      { "smailcf",	"/usr/src/usr.sbin (sendmail config macros)",
-	dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
       { "All",		"Select all of the above",
 	NULL,		setSrc, NULL, NULL, ' ', ' ', ' ' },
       { "Clear",	"Reset all of the above",