diff --git a/release/Makefile b/release/Makefile
index e1a9d508a32d..913eec609183 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.225 1996/06/26 01:24:54 jkh Exp $
+#	$Id: Makefile,v 1.226 1996/06/26 19:06:11 jkh Exp $
 #
 # How to roll a release:
 #
@@ -413,6 +413,10 @@ ftp.1:
 	mkdir ${FD}
 	cd ${RD} && find floppies -print | cpio -dumpl ${FD}
 	cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
+	cp ${.CURDIR}/sysinstall/help/readme.hlp ${FD}/README.TXT
+	cp ${.CURDIR}/sysinstall/help/hardware.hlp ${FD}/HARDWARE.TXT
+	cp ${.CURDIR}/sysinstall/help/install.hlp ${FD}/INSTALL.TXT
+	cp ${.CURDIR}/sysinstall/help/relnotes.hlp ${FD}/RELNOTES.TXT
 
 #
 # --==## Setup a suitable cdrom-area ##==--
@@ -432,6 +436,10 @@ cdrom.1:
 		fi \
 	done
 	echo "CD_VERSION = ${BUILDNAME}" > ${CD}/cdrom.inf
+	cp ${.CURDIR}/sysinstall/help/readme.hlp ${CD}/README.TXT
+	cp ${.CURDIR}/sysinstall/help/hardware.hlp ${CD}/HARDWARE.TXT
+	cp ${.CURDIR}/sysinstall/help/install.hlp ${CD}/INSTALL.TXT
+	cp ${.CURDIR}/sysinstall/help/relnotes.hlp ${CD}/RELNOTES.TXT
 
 # Various "subroutine" and other supporting targets.
 
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 870491fa51ed..474f7062b374 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.37 1996/06/15 17:58:51 jkh Exp $
+ * $Id: config.c,v 1.38 1996/06/25 04:28:20 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -578,6 +578,22 @@ configGated(dialogMenuItem *self)
    return ret;
 }
 
+/* Load novell client/server package */
+int
+configNovell(dialogMenuItem *self)
+{
+    int ret = DITEM_SUCCESS;
+
+    if (variable_get(VAR_NOVELL))
+	variable_unset(VAR_NOVELL);
+    else {
+	ret = package_add("commerce/netcon/bsd60");
+	if (DITEM_STATUS(ret) == DITEM_SUCCESS)
+	    variable_set2(VAR_NOVELL, "YES");
+    }
+    return ret;
+}
+
 /* Load pcnfsd package */
 int
 configPCNFSD(dialogMenuItem *self)
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index c288c3d9ec36..5c1fce131ff1 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -24,7 +24,7 @@
 	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC)
 
 #define _DIST_USER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20 | DIST_COMPAT21)
 
 #define _DIST_XDEV \
 	(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS)
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index e9ddc05e4f89..39796573cb42 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.72 1996/06/26 09:09:30 jkh Exp $
+ * $Id: menus.c,v 1.73 1996/06/27 07:03:44 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -1037,6 +1037,8 @@ aspects of your system's network configuration.",
     dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
   { "Gated",		"This machine wants to run gated instead of routed",
     dmenuVarCheck, configGated, NULL, "gated" },
+  { "Novell",		"Install the Novell client/server demo package",
+    dmenuVarCheck, configNovell, NULL, "novell" },
   { "Ntpdate",		"Select a clock-syncronization server",
     dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" },
   { "Routed",		"Set flags for routed (default: -q)",
diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c
index b87adb3613a4..a0bc1e4c8e46 100644
--- a/release/sysinstall/package.c
+++ b/release/sysinstall/package.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: package.c,v 1.38 1996/05/27 22:12:05 jkh Exp $
+ * $Id: package.c,v 1.39 1996/06/25 04:28:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -110,7 +110,10 @@ package_extract(Device *dev, char *name, Boolean depended)
 	variable_set2("PKG_TMPDIR", "/usr/tmp");
     }
 
-    sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
+    if (!index(name, '/'))
+	sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
+    else
+	sprintf(path, "%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
     fd = dev->get(dev, path, TRUE);
     if (fd >= 0) {
 	int i, tot, pfd[2];
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 69051681a4a2..8dbf31ab0da4 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.63 1996/06/16 23:17:35 jkh Exp $
+ * $Id: sysinstall.h,v 1.64 1996/06/17 21:48:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -117,6 +117,7 @@
 #define VAR_NFS_SECURE			"nfsSecure"
 #define VAR_NFS_SERVER			"nfs_server"
 #define VAR_NO_CONFIRM			"noConfirm"
+#define VAR_NOVELL			"novell"
 #define VAR_NTPDATE			"ntpDate"
 #define VAR_PCNFSD			"pcnfsd"
 #define VAR_PKG_TMPDIR			"PKG_TMPDIR"
@@ -364,6 +365,11 @@ extern int	configSaverTimeout(dialogMenuItem *self);
 extern int	configNTP(dialogMenuItem *self);
 extern int	configXFree86(dialogMenuItem *self);
 extern int	configRoutedFlags(dialogMenuItem *self);
+extern int	configGated(dialogMenuItem *self);
+extern int	configSamba(dialogMenuItem *self);
+extern int	configPCNFSD(dialogMenuItem *self);
+extern int	configNFSServer(dialogMenuItem *self);
+extern int	configNovell(dialogMenuItem *self);
 
 /* crc.c */
 extern int	crc(int, unsigned long *, unsigned long *);
@@ -470,11 +476,6 @@ extern int	installFilesystems(dialogMenuItem *self);
 extern int	installVarDefaults(dialogMenuItem *self);
 extern Boolean	copySelf(void);
 
-/* installFinal.c */
-extern int	configGated(dialogMenuItem *self);
-extern int	configSamba(dialogMenuItem *self);
-extern int	configPCNFSD(dialogMenuItem *self);
-extern int	configNFSServer(dialogMenuItem *self);
 
 /* label.c */
 extern int	diskLabelEditor(dialogMenuItem *self);
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 870491fa51ed..474f7062b374 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.37 1996/06/15 17:58:51 jkh Exp $
+ * $Id: config.c,v 1.38 1996/06/25 04:28:20 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -578,6 +578,22 @@ configGated(dialogMenuItem *self)
    return ret;
 }
 
+/* Load novell client/server package */
+int
+configNovell(dialogMenuItem *self)
+{
+    int ret = DITEM_SUCCESS;
+
+    if (variable_get(VAR_NOVELL))
+	variable_unset(VAR_NOVELL);
+    else {
+	ret = package_add("commerce/netcon/bsd60");
+	if (DITEM_STATUS(ret) == DITEM_SUCCESS)
+	    variable_set2(VAR_NOVELL, "YES");
+    }
+    return ret;
+}
+
 /* Load pcnfsd package */
 int
 configPCNFSD(dialogMenuItem *self)
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index e9ddc05e4f89..39796573cb42 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.72 1996/06/26 09:09:30 jkh Exp $
+ * $Id: menus.c,v 1.73 1996/06/27 07:03:44 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -1037,6 +1037,8 @@ aspects of your system's network configuration.",
     dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
   { "Gated",		"This machine wants to run gated instead of routed",
     dmenuVarCheck, configGated, NULL, "gated" },
+  { "Novell",		"Install the Novell client/server demo package",
+    dmenuVarCheck, configNovell, NULL, "novell" },
   { "Ntpdate",		"Select a clock-syncronization server",
     dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" },
   { "Routed",		"Set flags for routed (default: -q)",
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 69051681a4a2..8dbf31ab0da4 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.63 1996/06/16 23:17:35 jkh Exp $
+ * $Id: sysinstall.h,v 1.64 1996/06/17 21:48:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -117,6 +117,7 @@
 #define VAR_NFS_SECURE			"nfsSecure"
 #define VAR_NFS_SERVER			"nfs_server"
 #define VAR_NO_CONFIRM			"noConfirm"
+#define VAR_NOVELL			"novell"
 #define VAR_NTPDATE			"ntpDate"
 #define VAR_PCNFSD			"pcnfsd"
 #define VAR_PKG_TMPDIR			"PKG_TMPDIR"
@@ -364,6 +365,11 @@ extern int	configSaverTimeout(dialogMenuItem *self);
 extern int	configNTP(dialogMenuItem *self);
 extern int	configXFree86(dialogMenuItem *self);
 extern int	configRoutedFlags(dialogMenuItem *self);
+extern int	configGated(dialogMenuItem *self);
+extern int	configSamba(dialogMenuItem *self);
+extern int	configPCNFSD(dialogMenuItem *self);
+extern int	configNFSServer(dialogMenuItem *self);
+extern int	configNovell(dialogMenuItem *self);
 
 /* crc.c */
 extern int	crc(int, unsigned long *, unsigned long *);
@@ -470,11 +476,6 @@ extern int	installFilesystems(dialogMenuItem *self);
 extern int	installVarDefaults(dialogMenuItem *self);
 extern Boolean	copySelf(void);
 
-/* installFinal.c */
-extern int	configGated(dialogMenuItem *self);
-extern int	configSamba(dialogMenuItem *self);
-extern int	configPCNFSD(dialogMenuItem *self);
-extern int	configNFSServer(dialogMenuItem *self);
 
 /* label.c */
 extern int	diskLabelEditor(dialogMenuItem *self);
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 870491fa51ed..474f7062b374 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.37 1996/06/15 17:58:51 jkh Exp $
+ * $Id: config.c,v 1.38 1996/06/25 04:28:20 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -578,6 +578,22 @@ configGated(dialogMenuItem *self)
    return ret;
 }
 
+/* Load novell client/server package */
+int
+configNovell(dialogMenuItem *self)
+{
+    int ret = DITEM_SUCCESS;
+
+    if (variable_get(VAR_NOVELL))
+	variable_unset(VAR_NOVELL);
+    else {
+	ret = package_add("commerce/netcon/bsd60");
+	if (DITEM_STATUS(ret) == DITEM_SUCCESS)
+	    variable_set2(VAR_NOVELL, "YES");
+    }
+    return ret;
+}
+
 /* Load pcnfsd package */
 int
 configPCNFSD(dialogMenuItem *self)
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index c288c3d9ec36..5c1fce131ff1 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -24,7 +24,7 @@
 	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC)
 
 #define _DIST_USER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20 | DIST_COMPAT21)
 
 #define _DIST_XDEV \
 	(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS)
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index e9ddc05e4f89..39796573cb42 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.72 1996/06/26 09:09:30 jkh Exp $
+ * $Id: menus.c,v 1.73 1996/06/27 07:03:44 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -1037,6 +1037,8 @@ aspects of your system's network configuration.",
     dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
   { "Gated",		"This machine wants to run gated instead of routed",
     dmenuVarCheck, configGated, NULL, "gated" },
+  { "Novell",		"Install the Novell client/server demo package",
+    dmenuVarCheck, configNovell, NULL, "novell" },
   { "Ntpdate",		"Select a clock-syncronization server",
     dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" },
   { "Routed",		"Set flags for routed (default: -q)",
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index b87adb3613a4..a0bc1e4c8e46 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: package.c,v 1.38 1996/05/27 22:12:05 jkh Exp $
+ * $Id: package.c,v 1.39 1996/06/25 04:28:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -110,7 +110,10 @@ package_extract(Device *dev, char *name, Boolean depended)
 	variable_set2("PKG_TMPDIR", "/usr/tmp");
     }
 
-    sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
+    if (!index(name, '/'))
+	sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
+    else
+	sprintf(path, "%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");
     fd = dev->get(dev, path, TRUE);
     if (fd >= 0) {
 	int i, tot, pfd[2];
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 69051681a4a2..8dbf31ab0da4 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.63 1996/06/16 23:17:35 jkh Exp $
+ * $Id: sysinstall.h,v 1.64 1996/06/17 21:48:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -117,6 +117,7 @@
 #define VAR_NFS_SECURE			"nfsSecure"
 #define VAR_NFS_SERVER			"nfs_server"
 #define VAR_NO_CONFIRM			"noConfirm"
+#define VAR_NOVELL			"novell"
 #define VAR_NTPDATE			"ntpDate"
 #define VAR_PCNFSD			"pcnfsd"
 #define VAR_PKG_TMPDIR			"PKG_TMPDIR"
@@ -364,6 +365,11 @@ extern int	configSaverTimeout(dialogMenuItem *self);
 extern int	configNTP(dialogMenuItem *self);
 extern int	configXFree86(dialogMenuItem *self);
 extern int	configRoutedFlags(dialogMenuItem *self);
+extern int	configGated(dialogMenuItem *self);
+extern int	configSamba(dialogMenuItem *self);
+extern int	configPCNFSD(dialogMenuItem *self);
+extern int	configNFSServer(dialogMenuItem *self);
+extern int	configNovell(dialogMenuItem *self);
 
 /* crc.c */
 extern int	crc(int, unsigned long *, unsigned long *);
@@ -470,11 +476,6 @@ extern int	installFilesystems(dialogMenuItem *self);
 extern int	installVarDefaults(dialogMenuItem *self);
 extern Boolean	copySelf(void);
 
-/* installFinal.c */
-extern int	configGated(dialogMenuItem *self);
-extern int	configSamba(dialogMenuItem *self);
-extern int	configPCNFSD(dialogMenuItem *self);
-extern int	configNFSServer(dialogMenuItem *self);
 
 /* label.c */
 extern int	diskLabelEditor(dialogMenuItem *self);