diff --git a/release/Makefile b/release/Makefile
index 702a5b8d0d29..97bbf923b6cd 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.264 1996/12/23 05:10:31 peter Exp $
+#	$Id: Makefile,v 1.265 1996/12/29 05:26:04 jkh Exp $
 #
 # How to roll a release:
 #
@@ -22,7 +22,7 @@
 # Things which without too much trouble can be considered variables
 
 COMPAT_DISTS=	compat1x compat20 compat21
-EXPORT_DISTS=	games manpages proflibs dict info doc ${COMPAT_DISTS}
+EXPORT_DISTS=	games manpages catpages proflibs dict info doc ${COMPAT_DISTS}
 EXTRA_DISTS=	krb des ${EXPORT_DISTS}
 ALL_DISTS=	bin ${EXTRA_DISTS}
 KERNELS?=	GENERIC
@@ -237,10 +237,19 @@ release.5:
 
 	# Move all the manpages out to their own dist
 	if [ -d ${RD}/trees/bin/usr/share/man ] ; then \
-		tar -cf - -C ${RD}/trees/bin/usr/share/man . | \
-			tar xf - -C ${RD}/trees/manpages/usr/share/man && \
+		( cd ${RD}/trees/bin/usr/share/man; \
+		find . | cpio -dumpl ${RD}/trees/manpages/usr/share/man ) && \
 		rm -rf ${RD}/trees/bin/usr/share/man; \
 	fi
+	# Create the catpages
+	if [ -d ${RD}/trees/manpages/usr/share/man ] ; then \
+		mtree -U -f ${.CURDIR}/man.mtree -d -e \
+			-p ${RD}/trees/manpages/usr/share; \
+		su -m man -c 'catman ${RD}/trees/manpages/usr/share/man'; \
+		( cd ${RD}/trees/manpages/usr/share/man; \
+		find cat* | cpio -dumpl ${RD}/trees/catpages/usr/share/man ) && \
+		rm -rf ${RD}/trees/manpages/usr/share/man/cat*; \
+	fi
 	# Move all the games out to their own dist
 	if [ -d ${RD}/trees/bin/usr/games ] ; then \
 		tar -cf - -C ${RD}/trees/bin/usr/games . | \
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index fc802d2263ff..175cb11e556e 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.83 1996/12/12 08:33:36 jkh Exp $
+ * $Id: dist.c,v 1.84 1996/12/14 23:08:58 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -65,6 +65,7 @@ static Distribution DistTable[] = {
 { "doc",	"/",			&Dists,		DIST_DOC,		NULL		},
 { "games",	"/",			&Dists,		DIST_GAMES,		NULL		},
 { "manpages",	"/",			&Dists,		DIST_MANPAGES,		NULL		},
+{ "catpages",	"/",			&Dists,		DIST_CATPAGES,		NULL		},
 { "proflibs",	"/",			&Dists,		DIST_PROFLIBS,		NULL		},
 { "dict",	"/",			&Dists,		DIST_DICT,		NULL		},
 { "info",	"/",			&Dists,		DIST_INFO,		NULL		},
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index 3f34f068257f..a76f3d346e84 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -15,7 +15,8 @@
 #define DIST_COMPAT21		0x0400
 #define DIST_XF86		0x0800
 #define DIST_DES		0x1000
-#define DIST_ALL		0x1FFF
+#define DIST_CATPAGES		0x2000
+#define DIST_ALL		0x3FFF
 
 /* Canned distribution sets */
 #define _DIST_DEVELOPER \
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index bb461de9771d..ae2c2aa8ae42 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.100 1996/12/09 06:02:28 jkh Exp $
+ * $Id: menus.c,v 1.101 1996/12/12 22:38:40 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -659,6 +659,8 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
       { "man",		"System manual pages - recommended [3.3M]",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
+      { "catman",	"Preformatted system manual pages [3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES },
       { "proflibs",	"Profiled versions of the libraries [3.3M]",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
       { "src",		"Sources for everything but DES [120M]",
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index bb461de9771d..ae2c2aa8ae42 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.100 1996/12/09 06:02:28 jkh Exp $
+ * $Id: menus.c,v 1.101 1996/12/12 22:38:40 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -659,6 +659,8 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
       { "man",		"System manual pages - recommended [3.3M]",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
+      { "catman",	"Preformatted system manual pages [3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES },
       { "proflibs",	"Profiled versions of the libraries [3.3M]",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
       { "src",		"Sources for everything but DES [120M]",
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index fc802d2263ff..175cb11e556e 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.83 1996/12/12 08:33:36 jkh Exp $
+ * $Id: dist.c,v 1.84 1996/12/14 23:08:58 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -65,6 +65,7 @@ static Distribution DistTable[] = {
 { "doc",	"/",			&Dists,		DIST_DOC,		NULL		},
 { "games",	"/",			&Dists,		DIST_GAMES,		NULL		},
 { "manpages",	"/",			&Dists,		DIST_MANPAGES,		NULL		},
+{ "catpages",	"/",			&Dists,		DIST_CATPAGES,		NULL		},
 { "proflibs",	"/",			&Dists,		DIST_PROFLIBS,		NULL		},
 { "dict",	"/",			&Dists,		DIST_DICT,		NULL		},
 { "info",	"/",			&Dists,		DIST_INFO,		NULL		},
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 3f34f068257f..a76f3d346e84 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -15,7 +15,8 @@
 #define DIST_COMPAT21		0x0400
 #define DIST_XF86		0x0800
 #define DIST_DES		0x1000
-#define DIST_ALL		0x1FFF
+#define DIST_CATPAGES		0x2000
+#define DIST_ALL		0x3FFF
 
 /* Canned distribution sets */
 #define _DIST_DEVELOPER \
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index bb461de9771d..ae2c2aa8ae42 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.100 1996/12/09 06:02:28 jkh Exp $
+ * $Id: menus.c,v 1.101 1996/12/12 22:38:40 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -659,6 +659,8 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
       { "man",		"System manual pages - recommended [3.3M]",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
+      { "catman",	"Preformatted system manual pages [3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES },
       { "proflibs",	"Profiled versions of the libraries [3.3M]",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
       { "src",		"Sources for everything but DES [120M]",