diff --git a/usr.bin/doscmd/README b/usr.bin/doscmd/README
index a90946cefc20..0201150cf43e 100644
--- a/usr.bin/doscmd/README
+++ b/usr.bin/doscmd/README
@@ -9,7 +9,7 @@ Things known not to work:
     *	No raw VGA support (yet)
     *	Printer support (yet)
     *	COM ports (being worked on)
-    *	redirected file system only supported for DOS 4.0 and above
+    *	redirected filesystem only supported for DOS 4.0 and above
 	(3.3 will be supported in a future version)
     *	Graphics in an X window (only 16 colors, very few programs)
 
diff --git a/usr.bin/doscmd/README.booting_dos b/usr.bin/doscmd/README.booting_dos
index 926c3ac1f3e8..41a68042a40c 100644
--- a/usr.bin/doscmd/README.booting_dos
+++ b/usr.bin/doscmd/README.booting_dos
@@ -31,7 +31,7 @@ To install DOS on a pseudo hard disk under doscmd:
     2)	Insert a floppy disk into the A: drive which is bootable to MS-DOS
 	and has the commands fdisk, format and sys on it.  You should also
 	copy the file redir.com onto the floppy by either mounting it
-	with the msdos file system type or by using mtools.
+	with the msdos filesystem type or by using mtools.
 
 		(i.e. mwrite redir.com a:)
 
diff --git a/usr.bin/doscmd/cwd.c b/usr.bin/doscmd/cwd.c
index 3ba92f0f6d6a..1410238a08ab 100644
--- a/usr.bin/doscmd/cwd.c
+++ b/usr.bin/doscmd/cwd.c
@@ -696,7 +696,7 @@ get_entries(u_char *path)
 }
 
 /*
- * Return file system statistics for drive.
+ * Return filesystem statistics for drive.
  * Return the DOS errno on failure.
  */
 int
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index 333221b2e832..89dd5ffb489f 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -329,7 +329,7 @@ directory
 .Ar path
 to be assigned as the specified drive.  If the
 .Fl ro
-flag is specified, it is a read only file system.
+flag is specified, it is a read only filesystem.
 These assignments will not take place when booting DOS until the
 .Pa /usr/libdata/doscmd/redir.com
 binary is run.
@@ -662,7 +662,7 @@ must exist, so use the command touch to create it.
 Insert a floppy disk into the A: drive which is bootable to MS-DOS
 and has the commands fdisk, format and sys on it.  You should also
 copy the file redir.com onto the floppy by either mounting it
-with the msdos file system type or by using mtools
+with the msdos filesystem type or by using mtools
 (e.g.,
 .Dq Li mwrite redir.com a: ) .
 .It 3
diff --git a/usr.bin/doscmd/ems.c b/usr.bin/doscmd/ems.c
index 39c0d87f7bfa..953c90b58d6d 100644
--- a/usr.bin/doscmd/ems.c
+++ b/usr.bin/doscmd/ems.c
@@ -73,7 +73,7 @@ u_long ems_frame_addr = EMS_FRAME_ADDR;
  * and map the needed part into the page frame 
  */
 
-#define EMS_MAP_PATH	"/var/tmp/"	/* Use a big file system */
+#define EMS_MAP_PATH	"/var/tmp/"	/* Use a big filesystem */
 #define EMS_MAP_FILE	"doscmd.XXXXXX"
 static int mapfile_fd = -1;
 
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 010ac0b32f78..7dc2bbf0084a 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -50,7 +50,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility displays the file system block usage for each file argument
+utility displays the filesystem block usage for each file argument
 and for each directory in the file hierarchy rooted in each directory
 argument.
 If no file is specified, the block usage of the hierarchy rooted in
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 47bd748f9f34..aa8f96fc3880 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -352,7 +352,7 @@ and none of the
 bits match those of
 .Ar notflags .
 .It Ic -fstype Ar type
-True if the file is contained in a file system of type
+True if the file is contained in a filesystem of type
 .Ar type .
 The
 .Xr sysctl 8
@@ -365,10 +365,10 @@ In addition, there are two pseudo-types,
 .Dq Li local
 and
 .Dq Li rdonly .
-The former matches any file system physically mounted on the system where
+The former matches any filesystem physically mounted on the system where
 the
 .Nm
-is being executed and the latter matches any file system which is
+is being executed and the latter matches any filesystem which is
 mounted read-only.
 .It Ic -group Ar gname
 True if the file belongs to the group
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 295bdbe2856f..7153891710fd 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -718,7 +718,7 @@ f_fstype(plan, entry)
 		curdev = entry->fts_statp->st_dev;
 
 		/*
-		 * Statfs follows symlinks; find wants the link's file system,
+		 * Statfs follows symlinks; find wants the link's filesystem,
 		 * not where it points.
 		 */
 		if (entry->fts_info == FTS_SL ||
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index 873f31d1945a..2dc70c783b69 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -7,7 +7,7 @@
 .Os
 .Sh NAME
 .Nm lsvfs
-.Nd list installed virtual file systems
+.Nd list installed virtual filesystems
 .Sh SYNOPSIS
 .Nm
 .Op Ar vfsname Ar ...
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index 7e4e8c6a5037..7da55c64c0a7 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -1243,7 +1243,7 @@ and
 .B \-L )
 and various other information on how PMake was configured.
 .Ix 0 ref configuration
-.Ix 0 ref makefile system
+.Ix 0 ref makefilesystem
 .IP \fB\-i\fP
 .Ix 0 def flags -i
 If you give this flag, PMake will ignore non-zero status returned
@@ -2400,7 +2400,7 @@ flag. This variable can then be used as an argument for the compiler
 in the normal fashion. The
 .CW .h
 suffix is already marked in this way in the system makefile.
-.Ix 0 ref makefile system
+.Ix 0 ref makefilesystem
 E.g. if you have
 .DS
 \&.SUFFIXES       : .bitmap
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index c00956ca50f4..60fc736920f5 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -986,7 +986,7 @@ Dir_MTime (gn)
 	/*
 	 * Only do this once -- the second time folks are checking to
 	 * see if the file was actually updated, so we need to actually go
-	 * to the file system.
+	 * to the filesystem.
 	 */
 	if (DEBUG(DIR)) {
 	    printf("Using cached time %s for %s\n",
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 63c5ab9cd2c2..2e212778900a 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -63,7 +63,7 @@
  * The structure for an individual graph node. Each node has several
  * pieces of data associated with it.
  *	1) the name of the target it describes
- *	2) the location of the target file in the file system.
+ *	2) the location of the target file in the filesystem.
  *	3) the type of operator used to define its sources (qv. parse.c)
  *	4) whether it is involved in this invocation of make
  *	5) whether the target has been remade
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index a1e3ca72756c..aa44378b5ac9 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -444,7 +444,7 @@ flush_appends()
 			 * Read files probably shouldn't be cached.  Since
 			 * it's not an error to read a non-existent file,
 			 * it's possible that another program is interacting
-			 * with the sed script through the file system.  It
+			 * with the sed script through the filesystem.  It
 			 * would be truly bizarre, but possible.  It's probably
 			 * not that big a performance win, anyhow.
 			 */
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index 3696eb552918..cb59b705e45c 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -53,7 +53,7 @@ server on
 .Ar host .
 By default it prints the names of all hosts that have
 .Tn NFS
-file systems mounted
+filesystems mounted
 on the host.
 See
 .%T "NFS: Network File System Protocol Specification" ,
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index e2b13df362e2..3cd2b3a885a1 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -316,7 +316,7 @@ abbreviated
 .Ar fo  ;
 default value is `^P'.
 .It Ar framesize
-(num) The amount of data (in bytes) to buffer between file system
+(num) The amount of data (in bytes) to buffer between filesystem
 writes when receiving files; abbreviated
 .Ar fr  .
 .It Ar host
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index e2e0ad9a3ed2..79484ccc9ad7 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -223,10 +223,10 @@ exits abnormally.
 .Pp
 File flags cannot be set by
 .Xr fchflags 2
-over a NFS file system.  Other file systems do not have a concept of flags.
+over a NFS filesystem.  Other filesystems do not have a concept of flags.
 The
 .Nm
-utility will only warn when flags could not be set on a file system
+utility will only warn when flags could not be set on a filesystem
 that does not support them.
 .Pp
 The