diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c
index c3a6d290df8..1e68ba1ce32 100644
--- a/release/sysinstall/cdrom.c
+++ b/release/sysinstall/cdrom.c
@@ -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: cdrom.c,v 1.20 1996/07/13 05:48:44 jkh Exp $
+ * $Id: cdrom.c,v 1.21 1996/07/16 17:11:38 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -124,7 +124,8 @@ mediaGetCDROM(Device *dev, char *file, Boolean probe)
 {
     char	buf[PATH_MAX];
 
-    msgDebug("Request for %s from CDROM\n", file);
+    if (isDebug())
+	msgDebug("Request for %s from CDROM\n", file);
     snprintf(buf, PATH_MAX, "/cdrom/%s", file);
     if (file_readable(buf))
 	return open(buf, O_RDONLY);
diff --git a/release/sysinstall/dos.c b/release/sysinstall/dos.c
index b1edd3d4835..d1aa615f717 100644
--- a/release/sysinstall/dos.c
+++ b/release/sysinstall/dos.c
@@ -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: dos.c,v 1.12 1996/04/28 03:26:54 jkh Exp $
+ * $Id: dos.c,v 1.13 1996/07/08 08:54:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -82,7 +82,8 @@ mediaGetDOS(Device *dev, char *file, Boolean probe)
 {
     char		buf[PATH_MAX];
 
-    msgDebug("Request for %s from DOS\n", file);
+    if (isDebug())
+	msgDebug("Request for %s from DOS\n", file);
     snprintf(buf, PATH_MAX, "/dos/freebsd/%s", file);
     if (file_readable(buf))
 	return open(buf, O_RDONLY);
diff --git a/release/sysinstall/help/hardware.hlp b/release/sysinstall/help/hardware.hlp
index d807f40b7a7..d96fe76e062 100644
--- a/release/sysinstall/help/hardware.hlp
+++ b/release/sysinstall/help/hardware.hlp
@@ -1,4 +1,4 @@
-Hardware Documentation Guide:  $Id: hardware.hlp,v 1.6 1996/07/05 01:24:38 jkh Exp $
+Hardware Documentation Guide:  $Id: hardware.hlp,v 1.7 1996/07/10 09:41:18 jkh Exp $
 
 Contents last changed:  July 4th, 1996
 
@@ -89,7 +89,7 @@ lpt1    dyn     dyn     n/a     n/a     Printer Port 1
 de0     n/a     n/a     n/a     n/a     DEC DC21x40 PCI based cards
                                         (including 21140 100bT cards)
 ed0     280     5       dyn     d8000   WD & SMC 80xx; Novell NE1000 &
-                                        NE2000; 3Com 3C503
+                                        NE2000; 3Com 3C503; HP PC Lan+
 ed1     300     5       dyn     d8000   Same as ed0
 eg0     310     5       dyn     dyn     3Com 3C505
 ep0     300     10      dyn     dyn     3Com 3C509
diff --git a/release/sysinstall/help/relnotes.hlp b/release/sysinstall/help/relnotes.hlp
index cf142d1cb1c..f8ebb3d2e91 100644
--- a/release/sysinstall/help/relnotes.hlp
+++ b/release/sysinstall/help/relnotes.hlp
@@ -1,9 +1,13 @@
                                  RELEASE NOTES
                           FreeBSD Release 2.2 SNAPSHOT
 
-
-0. What's new since 2.2-960501-SNAP?
+0. What's new since 2.2-960801-SNAP?
 ------------------------------------
+Support for HP PC Lan+ cards (model numbers: 27247B and 27252A)
+
+
+1. What's New since 2.1.0-RELEASE?
+----------------------------------
 A considerable number of changes to the VM system have been made
 to increase the stability under certain types of load.  If you
 had panics under the last snapshot, try this one and see if they
@@ -15,12 +19,6 @@ gracefully.
 More cosmetic work on the installation, /stand/sysinstall now genuinely
 useful after installation time (though still missing a man page - urk!).
 
-Basically, lots-o-fixes.
-
-
-1. What's New since 2.1.0-RELEASE?
-----------------------------------
-
 Early support for APM (automated power management) and PCCARD
 (formerly PCMCIA) features of laptops.  Many PCCARD devices
 are supported, from modems to ethernet cards to SCSI adaptors.
@@ -511,4 +509,4 @@ We sincerely hope you enjoy this release of FreeBSD!
 
                         The FreeBSD Core Team
 
-$Id: relnotes.hlp,v 1.9 1996/06/27 07:13:45 jkh Exp $
+$Id: relnotes.hlp,v 1.10 1996/07/05 01:24:40 jkh Exp $
diff --git a/release/sysinstall/nfs.c b/release/sysinstall/nfs.c
index 516e4f1b1ed..ce16cec605a 100644
--- a/release/sysinstall/nfs.c
+++ b/release/sysinstall/nfs.c
@@ -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: nfs.c,v 1.9 1996/04/23 01:29:30 jkh Exp $
+ * $Id: nfs.c,v 1.10 1996/07/08 08:54:31 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -75,7 +75,8 @@ mediaGetNFS(Device *dev, char *file, Boolean probe)
 {
     char	buf[PATH_MAX];
 
-    msgDebug("Request for %s from NFS\n", file);
+    if (isDebug())
+	msgDebug("Request for %s from NFS\n", file);
     snprintf(buf, PATH_MAX, "/dist/%s", file);
     if (file_readable(buf))
 	return open(buf, O_RDONLY);
diff --git a/release/sysinstall/tape.c b/release/sysinstall/tape.c
index e6111130601..5c8f602fd13 100644
--- a/release/sysinstall/tape.c
+++ b/release/sysinstall/tape.c
@@ -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: tape.c,v 1.11 1996/04/23 01:29:34 jkh Exp $
+ * $Id: tape.c,v 1.12 1996/07/08 08:54:36 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -84,7 +84,8 @@ mediaGetTape(Device *dev, char *file, Boolean probe)
     int fd;
 
     sprintf(buf, "%s/%s", (char *)dev->private, file);
-    msgDebug("Request for %s from tape (looking in %s)\n", file, buf);
+    if (isDebug())
+	msgDebug("Request for %s from tape (looking in %s)\n", file, buf);
     if (file_readable(buf))
 	fd = open(buf, O_RDONLY);
     else {
diff --git a/release/sysinstall/ufs.c b/release/sysinstall/ufs.c
index 95ea97f1987..9a70070e4a1 100644
--- a/release/sysinstall/ufs.c
+++ b/release/sysinstall/ufs.c
@@ -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: ufs.c,v 1.7 1996/03/02 07:31:58 jkh Exp $
+ * $Id: ufs.c,v 1.8 1996/04/13 13:32:14 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -47,7 +47,8 @@ mediaGetUFS(Device *dev, char *file, Boolean probe)
 {
     char		buf[PATH_MAX];
 
-    msgDebug("Request for %s from UFS\n", file);
+    if (isDebug())
+	msgDebug("Request for %s from UFS\n", file);
     snprintf(buf, PATH_MAX, "%s/%s", dev->private, file);
     if (file_readable(buf))
 	return open(buf, O_RDONLY);
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index c3a6d290df8..1e68ba1ce32 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -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: cdrom.c,v 1.20 1996/07/13 05:48:44 jkh Exp $
+ * $Id: cdrom.c,v 1.21 1996/07/16 17:11:38 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -124,7 +124,8 @@ mediaGetCDROM(Device *dev, char *file, Boolean probe)
 {
     char	buf[PATH_MAX];
 
-    msgDebug("Request for %s from CDROM\n", file);
+    if (isDebug())
+	msgDebug("Request for %s from CDROM\n", file);
     snprintf(buf, PATH_MAX, "/cdrom/%s", file);
     if (file_readable(buf))
 	return open(buf, O_RDONLY);
diff --git a/usr.sbin/sysinstall/dos.c b/usr.sbin/sysinstall/dos.c
index b1edd3d4835..d1aa615f717 100644
--- a/usr.sbin/sysinstall/dos.c
+++ b/usr.sbin/sysinstall/dos.c
@@ -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: dos.c,v 1.12 1996/04/28 03:26:54 jkh Exp $
+ * $Id: dos.c,v 1.13 1996/07/08 08:54:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -82,7 +82,8 @@ mediaGetDOS(Device *dev, char *file, Boolean probe)
 {
     char		buf[PATH_MAX];
 
-    msgDebug("Request for %s from DOS\n", file);
+    if (isDebug())
+	msgDebug("Request for %s from DOS\n", file);
     snprintf(buf, PATH_MAX, "/dos/freebsd/%s", file);
     if (file_readable(buf))
 	return open(buf, O_RDONLY);
diff --git a/usr.sbin/sysinstall/nfs.c b/usr.sbin/sysinstall/nfs.c
index 516e4f1b1ed..ce16cec605a 100644
--- a/usr.sbin/sysinstall/nfs.c
+++ b/usr.sbin/sysinstall/nfs.c
@@ -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: nfs.c,v 1.9 1996/04/23 01:29:30 jkh Exp $
+ * $Id: nfs.c,v 1.10 1996/07/08 08:54:31 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -75,7 +75,8 @@ mediaGetNFS(Device *dev, char *file, Boolean probe)
 {
     char	buf[PATH_MAX];
 
-    msgDebug("Request for %s from NFS\n", file);
+    if (isDebug())
+	msgDebug("Request for %s from NFS\n", file);
     snprintf(buf, PATH_MAX, "/dist/%s", file);
     if (file_readable(buf))
 	return open(buf, O_RDONLY);
diff --git a/usr.sbin/sysinstall/tape.c b/usr.sbin/sysinstall/tape.c
index e6111130601..5c8f602fd13 100644
--- a/usr.sbin/sysinstall/tape.c
+++ b/usr.sbin/sysinstall/tape.c
@@ -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: tape.c,v 1.11 1996/04/23 01:29:34 jkh Exp $
+ * $Id: tape.c,v 1.12 1996/07/08 08:54:36 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -84,7 +84,8 @@ mediaGetTape(Device *dev, char *file, Boolean probe)
     int fd;
 
     sprintf(buf, "%s/%s", (char *)dev->private, file);
-    msgDebug("Request for %s from tape (looking in %s)\n", file, buf);
+    if (isDebug())
+	msgDebug("Request for %s from tape (looking in %s)\n", file, buf);
     if (file_readable(buf))
 	fd = open(buf, O_RDONLY);
     else {
diff --git a/usr.sbin/sysinstall/ufs.c b/usr.sbin/sysinstall/ufs.c
index 95ea97f1987..9a70070e4a1 100644
--- a/usr.sbin/sysinstall/ufs.c
+++ b/usr.sbin/sysinstall/ufs.c
@@ -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: ufs.c,v 1.7 1996/03/02 07:31:58 jkh Exp $
+ * $Id: ufs.c,v 1.8 1996/04/13 13:32:14 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -47,7 +47,8 @@ mediaGetUFS(Device *dev, char *file, Boolean probe)
 {
     char		buf[PATH_MAX];
 
-    msgDebug("Request for %s from UFS\n", file);
+    if (isDebug())
+	msgDebug("Request for %s from UFS\n", file);
     snprintf(buf, PATH_MAX, "%s/%s", dev->private, file);
     if (file_readable(buf))
 	return open(buf, O_RDONLY);