diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 543b46f571e4..a074ff638cfc 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -668,6 +668,7 @@ options 	NFS			#Network File System
 #options 	NFS_NOSERVER		#Disable the NFS-server code.
 options 	CD9660			#ISO 9660 filesystem
 options 	FDESC			#File descriptor filesystem
+options 	HPFS			#OS/2 File system
 options 	MSDOSFS			#MS DOS File System (FAT, FAT32)
 options 	NTFS			#NT File System
 options 	NULLFS			#NULL filesystem
diff --git a/sys/conf/files b/sys/conf/files
index f4b88efd75fc..e057468d34f6 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -548,6 +548,12 @@ dev/xe/if_xe.c			optional xe card
 fs/devfs/devfs_vnops.c		optional devfs
 fs/devfs/devfs_vfsops.c		optional devfs
 fs/devfs/devfs_devs.c		optional devfs
+fs/hpfs/hpfs_vfsops.c		optional hpfs
+fs/hpfs/hpfs_vnops.c		optional hpfs
+fs/hpfs/hpfs_hash.c		optional hpfs
+fs/hpfs/hpfs_subr.c		optional hpfs
+fs/hpfs/hpfs_lookup.c		optional hpfs
+fs/hpfs/hpfs_alsubr.c		optional hpfs
 gnu/ext2fs/ext2_alloc.c		optional ext2fs
 gnu/ext2fs/ext2_balloc.c	optional ext2fs
 gnu/ext2fs/ext2_inode.c		optional ext2fs
diff --git a/sys/conf/options b/sys/conf/options
index 4670fe1f9b63..97420fdac202 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -114,6 +114,7 @@ PORTAL		opt_dontuse.h
 PROCFS		opt_dontuse.h
 UMAPFS		opt_dontuse.h
 NTFS		opt_dontuse.h
+HPFS		opt_dontuse.h
 
 # These static filesystems has one slightly bogus static dependency in
 # sys/i386/i386/autoconf.c.  If any of these filesystems are
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 543b46f571e4..a074ff638cfc 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -668,6 +668,7 @@ options 	NFS			#Network File System
 #options 	NFS_NOSERVER		#Disable the NFS-server code.
 options 	CD9660			#ISO 9660 filesystem
 options 	FDESC			#File descriptor filesystem
+options 	HPFS			#OS/2 File system
 options 	MSDOSFS			#MS DOS File System (FAT, FAT32)
 options 	NTFS			#NT File System
 options 	NULLFS			#NULL filesystem