diff --git a/gnu/usr.bin/tar/tar.1 b/gnu/usr.bin/tar/tar.1
index d7209de7d44..4ae542a4990 100644
--- a/gnu/usr.bin/tar/tar.1
+++ b/gnu/usr.bin/tar/tar.1
@@ -350,14 +350,14 @@ tar -cf - -C srcdir . | tar xpf - -C destdir
 .Ed
 .Pp
 To create a compressed archive on diskette, using gzip, use a command-line like
-.Dl tar --block-compress -z -c -v -f /dev/rfd1a -b 36 tar/
+.Dl tar --block-compress -z -c -v -f /dev/fd1a -b 36 tar/
 .Pp
 Note that you cannot mix bundled flags and --style flags; you can use
 single-letter flags in the manner above, rather than having to type
-.Dl tar --block-compress --gzip --verbose --file /dev/rfd1a --block-size 20 tar/
+.Dl tar --block-compress --gzip --verbose --file /dev/fd1a --block-size 20 tar/
 .Pp
 The above-created diskette can be listed with
-.Dl tar tvfbz /dev/rfd1a 36
+.Dl tar tvfbz /dev/fd1a 36
 .Pp
 To join two tar archives into a single archive, use
 .Dl tar Af archive1.tar archive2.tar
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index 8ecdcec1363..83ebca25760 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -26,8 +26,8 @@ EXEGRP=		bin
 #BINMODE=	2555
 EXEMODE=	444
 
-.if !defined(NO_X) && !defined(DESTDIR) && exists(${X11BASE}/include/X11/X.h) \
-    && exists(${XLIBDIR}/libX11.a)
+.if !defined(NO_X11SUPPORT) && !defined(DESTDIR) \
+    && exists(${X11BASE}/include/X11/X.h) && exists(${XLIBDIR}/libX11.a)
 CFLAGS+=	-I${X11BASE}/include
 LDADD+=		-L${XLIBDIR} -lX11
 DPADD+=		${XLIBDIR}/libX11.a
diff --git a/usr.bin/doscmd/README.booting_dos b/usr.bin/doscmd/README.booting_dos
index e33924f8528..926c3ac1f3e 100644
--- a/usr.bin/doscmd/README.booting_dos
+++ b/usr.bin/doscmd/README.booting_dos
@@ -1,19 +1,18 @@
 /* BSDI README.booting_dos,v 2.2 1996/04/08 19:32:18 bostic Exp*/
+/* $FreeBSD$ */
 
 To install DOS on a pseudo hard disk under doscmd:
 
     1)	Create a .doscmdrc with at least the following:
 
-	    assign A: /dev/rfd0_1440_3.5 1440
-	    assign A: /dev/rfd0_720_3.5 720
+	    assign A: /dev/fd0.1440 1440
+	    assign A: /dev/fd0.720 720
 	    assign hard boot_drive 80 2 2
 
 	You may need to adjust the raw files for the A: drive to match
 	your system.  This example will cause the HD drive to be tried
 	first and the DD drive second.
 
-	[ For FreeBSD the A: drive devices are /dev/rfd0.1440 and /dev/rfd0.720 ]
-
 	Note that you should only use raw devices or files at this point,
 	do not use a cooked device!  (Well, it would probably be okay
 	for a hard disk, but certainly not the floppy)
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index ac9e1f21988..1aab48de092 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -612,8 +612,8 @@ Create a
 .Pa .doscmdrc
 with at least the following:
 .Bd -literal -offset indent
-assign A: /dev/rfd0.1440 1440
-assign A: /dev/rfd0.720 720
+assign A: /dev/fd0.1440 1440
+assign A: /dev/fd0.720 720
 assign hard boot_drive 80 2 2
 .Ed
 .Pp