diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 3ec0cca19d7c..61b4b4e42769 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20121114: zpool-features manual page moved from section 5 to 7
+OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
 # 20121022: VFS_LOCK_GIANT elimination
 OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
similarity index 99%
rename from cddl/contrib/opensolaris/cmd/zpool/zpool-features.5
rename to cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
index 8c023257d85e..999212c16a0a 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
@@ -22,7 +22,7 @@
 .\" $FreeBSD$
 .\"
 .Dd Aug 28, 2012
-.Dt ZPOOL-FEATURES 5
+.Dt ZPOOL-FEATURES 7
 .Os
 .Sh NAME
 .Nm zpool-features
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 b/cddl/contrib/opensolaris/cmd/zpool/zpool.8
index 88fc79ba0ff3..0a4de1f321fa 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool.8
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool.8
@@ -567,7 +567,7 @@ Total size of the storage pool.
 .It Sy unsupported@ Ns Ar feature_guid
 Information about unsupported features that are enabled on the pool.
 See
-.Xr zpool-features 5
+.Xr zpool-features 7
 for details.
 .It Sy used
 Amount of storage space used within the pool.
@@ -717,7 +717,7 @@ which moves
 .Ar feature_name
 to the enabled state.
 See
-.Xr zpool-features 5
+.Xr zpool-features 7
 for details on feature states.
 .It Sy listsnaps Ns = Ns Cm on No | Cm off
 Controls whether information about snapshots associated with this pool is
@@ -915,7 +915,7 @@ with the
 .Fl o
 option.
 See
-.Xr zpool-features 5
+.Xr zpool-features 7
 for details about feature properties.
 .It Xo
 .Fl o Ar property Ns = Ns Ar value
@@ -1651,7 +1651,7 @@ Displays legacy
 .Tn ZFS
 versions supported by the current software.
 See
-.Xr zpool-features.5
+.Xr zpool-features 7
 for a description of feature flags features supported by the current software.
 .El
 .It Xo
@@ -1665,7 +1665,7 @@ Enables all supported features on the given pool.
 Once this is done, the pool will no longer be accessible on systems that do
 not support feature flags.
 See
-.Xr zpool-features.5
+.Xr zpool-features 7
 for details on compatability with system sthat support feature flags, but do
 not support all features enabled on the pool.
 .Bl -tag -width indent
@@ -1928,7 +1928,7 @@ Discarded approximately 29 seconds of transactions.
 .El
 .Sh SEE ALSO
 .Xr zfs 8
-.Xr zpool-features 5
+.Xr zpool-features 7
 .Sh AUTHORS
 This manual page is a
 .Xr mdoc 7
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
index b57c816b1f59..3c2a625d2e7c 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
@@ -345,7 +345,7 @@ usage(boolean_t requested)
 		(void) fprintf(fp, "YES   disabled | enabled | active\n");
 
 		(void) fprintf(fp, gettext("\nThe feature@ properties must be "
-		    "appended with a feature name.\nSee zpool-features(5).\n"));
+		    "appended with a feature name.\nSee zpool-features(7).\n"));
 	}
 
 	/*
@@ -4170,7 +4170,7 @@ status_callback(zpool_handle_t *zhp, void *data)
 		(void) printf(gettext("action: Enable all features using "
 		    "'zpool upgrade'. Once this is done,\n\tthe pool may no "
 		    "longer be accessible by software that does not support\n\t"
-		    "the features. See zpool-features(5) for details.\n"));
+		    "the features. See zpool-features(7) for details.\n"));
 		break;
 
 	case ZPOOL_STATUS_UNSUP_FEAT_READ:
@@ -4630,7 +4630,7 @@ upgrade_list_disabled_cb(zpool_handle_t *zhp, void *arg)
 					    "pool may become incompatible with "
 					    "software\nthat does not support "
 					    "the feature. See "
-					    "zpool-features(5) for "
+					    "zpool-features(7) for "
 					    "details.\n\n"));
 					(void) printf(gettext("POOL  "
 					    "FEATURE\n"));
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index 327f6dc82e61..b9d44b61305b 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 
 PROG=	zpool
-MAN=	zpool.8 zpool-features.5
+MAN=	zpool.8 zpool-features.7
 SRCS=	zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c
 SRCS+=	timestamp.c