diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index f6548a385eb2..968be8a9f8ca 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -124,6 +124,7 @@ ffs_copyonwrite(devvp, bp)
 }
 
 #else
+FEATURE(ffs_snapshot, "FFS snapshot support");
 
 TAILQ_HEAD(snaphead, inode);
 
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 0e790d631fcb..3656342173d1 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -575,6 +575,9 @@ softdep_get_depcounts(struct mount *mp,
 }
 
 #else
+
+FEATURE(softupdates, "FFS soft-updates support");
+
 /*
  * These definitions need to be adapted to the system to which
  * this file is being ported.
diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c
index 8ed1c0b2110c..11794517f71a 100644
--- a/sys/ufs/ufs/ufs_acl.c
+++ b/sys/ufs/ufs/ufs_acl.c
@@ -57,6 +57,8 @@ __FBSDID("$FreeBSD$");
 
 #ifdef UFS_ACL
 
+FEATURE(ufs_acl, "ACL support for UFS");
+
 /*
  * Synchronize an ACL and an inode by copying over appropriate inode fields
  * to the passed ACL.  Assumes an ACL that would satisfy acl_posix1e_check(),
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index c396910123a5..daa6db8f51c0 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -82,8 +82,19 @@ __FBSDID("$FreeBSD$");
 #endif
 #ifdef UFS_GJOURNAL
 #include <ufs/ufs/gjournal.h>
+FEATURE(ufs_gjournal, "Journaling support through GEOM for UFS");
 #endif
 
+#ifdef QUOTA
+FEATURE(ufs_quota, "UFS disk quotas support");
+FEATURE(ufs_quota64, "64bit UFS disk quotas support");
+#endif
+
+#ifdef SUIDDIR
+FEATURE(suiddir, "Give all new files in directory the same ownership as the directory");
+#endif
+
+
 #include <ufs/ffs/ffs_extern.h>
 
 static vop_accessx_t	ufs_accessx;