diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 9cddbcea1993..eead7f19769d 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,69 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150604: Move nvlist man pages to section 9.
+OLD_FILES+=usr/share/man/man3/libnv.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_add_binary.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_add_bool.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_add_descriptor.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_add_null.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_add_number.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_add_nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_add_string.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_add_stringf.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_add_stringv.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_clone.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_create.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_destroy.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_dump.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_empty.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_error.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_exists.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_exists_binary.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_exists_bool.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_exists_descriptor.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_exists_null.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_exists_number.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_exists_nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_exists_string.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_exists_type.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_fdump.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_flags.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_free.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_free_binary.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_free_bool.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_free_descriptor.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_free_null.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_free_number.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_free_nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_free_string.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_free_type.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_get_binary.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_get_bool.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_get_descriptor.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_get_number.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_get_nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_get_parent.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_get_string.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_move_binary.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_move_descriptor.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_move_nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_move_string.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_next.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_pack.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_recv.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_send.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_set_error.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_size.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_take_binary.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_take_bool.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_take_descriptor.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_take_number.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_take_nvlist.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_take_string.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_unpack.3.gz
+OLD_FILES+=usr/share/man/man3/nvlist_xfer.3.gz
 # 20150702: Remove duplicated nvlist includes.
 OLD_FILES+=usr/include/dnv.h
 OLD_FILES+=usr/include/nv.h
diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
index 93ccc7ac8027..1aef64e68597 100644
--- a/lib/libnv/Makefile
+++ b/lib/libnv/Makefile
@@ -15,71 +15,6 @@ SRCS+=	msgio.c
 SRCS+=	subr_nvlist.c
 SRCS+=	subr_nvpair.c
 
-MAN+=	nv.3
-
-MLINKS+=nv.3 libnv.3 \
-	nv.3 nvlist.3
-MLINKS+=nv.3 nvlist_add_binary.3 \
-	nv.3 nvlist_add_bool.3 \
-	nv.3 nvlist_add_descriptor.3 \
-	nv.3 nvlist_add_null.3 \
-	nv.3 nvlist_add_number.3 \
-	nv.3 nvlist_add_nvlist.3 \
-	nv.3 nvlist_add_string.3 \
-	nv.3 nvlist_add_stringf.3 \
-	nv.3 nvlist_add_stringv.3 \
-	nv.3 nvlist_clone.3 \
-	nv.3 nvlist_create.3 \
-	nv.3 nvlist_destroy.3 \
-	nv.3 nvlist_dump.3 \
-	nv.3 nvlist_empty.3 \
-	nv.3 nvlist_error.3 \
-	nv.3 nvlist_exists.3 \
-	nv.3 nvlist_exists_binary.3 \
-	nv.3 nvlist_exists_bool.3 \
-	nv.3 nvlist_exists_descriptor.3 \
-	nv.3 nvlist_exists_null.3 \
-	nv.3 nvlist_exists_number.3 \
-	nv.3 nvlist_exists_nvlist.3 \
-	nv.3 nvlist_exists_string.3 \
-	nv.3 nvlist_exists_type.3 \
-	nv.3 nvlist_fdump.3 \
-	nv.3 nvlist_flags.3 \
-	nv.3 nvlist_free.3 \
-	nv.3 nvlist_free_binary.3 \
-	nv.3 nvlist_free_bool.3 \
-	nv.3 nvlist_free_descriptor.3 \
-	nv.3 nvlist_free_null.3 \
-	nv.3 nvlist_free_number.3 \
-	nv.3 nvlist_free_nvlist.3 \
-	nv.3 nvlist_free_string.3 \
-	nv.3 nvlist_free_type.3 \
-	nv.3 nvlist_get_binary.3 \
-	nv.3 nvlist_get_bool.3 \
-	nv.3 nvlist_get_descriptor.3 \
-	nv.3 nvlist_get_number.3 \
-	nv.3 nvlist_get_nvlist.3 \
-	nv.3 nvlist_get_parent.3 \
-	nv.3 nvlist_get_string.3 \
-	nv.3 nvlist_move_binary.3 \
-	nv.3 nvlist_move_descriptor.3 \
-	nv.3 nvlist_move_nvlist.3 \
-	nv.3 nvlist_move_string.3 \
-	nv.3 nvlist_next.3 \
-	nv.3 nvlist_pack.3 \
-	nv.3 nvlist_recv.3 \
-	nv.3 nvlist_send.3 \
-	nv.3 nvlist_set_error.3 \
-	nv.3 nvlist_size.3 \
-	nv.3 nvlist_take_binary.3 \
-	nv.3 nvlist_take_bool.3 \
-	nv.3 nvlist_take_descriptor.3 \
-	nv.3 nvlist_take_number.3 \
-	nv.3 nvlist_take_nvlist.3 \
-	nv.3 nvlist_take_string.3 \
-	nv.3 nvlist_unpack.3 \
-	nv.3 nvlist_xfer.3
-
 WARNS?=	6
 
 .if ${MK_TESTS} != "no"
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index d0e204f99586..21541908e218 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -188,6 +188,7 @@ MAN=	accept_filter.9 \
 	mutex.9 \
 	namei.9 \
 	netisr.9 \
+	nv.9 \
 	osd.9 \
 	panic.9 \
 	pbuf.9 \
@@ -1127,6 +1128,68 @@ MLINKS+=netisr.9 netisr_clearqdrops.9 \
 	netisr.9 netisr_register.9 \
 	netisr.9 netisr_setqlimit.9 \
 	netisr.9 netisr_unregister.9
+MLINKS+=nv.9 libnv.9 \
+	nv.9 nvlist.9 \
+	nv.9 nvlist_add_binary.9 \
+	nv.9 nvlist_add_bool.9 \
+	nv.9 nvlist_add_descriptor.9 \
+	nv.9 nvlist_add_null.9 \
+	nv.9 nvlist_add_number.9 \
+	nv.9 nvlist_add_nvlist.9 \
+	nv.9 nvlist_add_string.9 \
+	nv.9 nvlist_add_stringf.9 \
+	nv.9 nvlist_add_stringv.9 \
+	nv.9 nvlist_clone.9 \
+	nv.9 nvlist_create.9 \
+	nv.9 nvlist_destroy.9 \
+	nv.9 nvlist_dump.9 \
+	nv.9 nvlist_empty.9 \
+	nv.9 nvlist_error.9 \
+	nv.9 nvlist_exists.9 \
+	nv.9 nvlist_exists_binary.9 \
+	nv.9 nvlist_exists_bool.9 \
+	nv.9 nvlist_exists_descriptor.9 \
+	nv.9 nvlist_exists_null.9 \
+	nv.9 nvlist_exists_number.9 \
+	nv.9 nvlist_exists_nvlist.9 \
+	nv.9 nvlist_exists_string.9 \
+	nv.9 nvlist_exists_type.9 \
+	nv.9 nvlist_fdump.9 \
+	nv.9 nvlist_flags.9 \
+	nv.9 nvlist_free.9 \
+	nv.9 nvlist_free_binary.9 \
+	nv.9 nvlist_free_bool.9 \
+	nv.9 nvlist_free_descriptor.9 \
+	nv.9 nvlist_free_null.9 \
+	nv.9 nvlist_free_number.9 \
+	nv.9 nvlist_free_nvlist.9 \
+	nv.9 nvlist_free_string.9 \
+	nv.9 nvlist_free_type.9 \
+	nv.9 nvlist_get_binary.9 \
+	nv.9 nvlist_get_bool.9 \
+	nv.9 nvlist_get_descriptor.9 \
+	nv.9 nvlist_get_number.9 \
+	nv.9 nvlist_get_nvlist.9 \
+	nv.9 nvlist_get_parent.9 \
+	nv.9 nvlist_get_string.9 \
+	nv.9 nvlist_move_binary.9 \
+	nv.9 nvlist_move_descriptor.9 \
+	nv.9 nvlist_move_nvlist.9 \
+	nv.9 nvlist_move_string.9 \
+	nv.9 nvlist_next.9 \
+	nv.9 nvlist_pack.9 \
+	nv.9 nvlist_recv.9 \
+	nv.9 nvlist_send.9 \
+	nv.9 nvlist_set_error.9 \
+	nv.9 nvlist_size.9 \
+	nv.9 nvlist_take_binary.9 \
+	nv.9 nvlist_take_bool.9 \
+	nv.9 nvlist_take_descriptor.9 \
+	nv.9 nvlist_take_number.9 \
+	nv.9 nvlist_take_nvlist.9 \
+	nv.9 nvlist_take_string.9 \
+	nv.9 nvlist_unpack.9 \
+	nv.9 nvlist_xfer.9
 MLINKS+=osd.9 osd_call.9 \
 	osd.9 osd_del.9 \
 	osd.9 osd_deregister.9 \
diff --git a/lib/libnv/nv.3 b/share/man/man9/nv.9
similarity index 99%
rename from lib/libnv/nv.3
rename to share/man/man9/nv.9
index 58033be61fed..2184ae640566 100644
--- a/lib/libnv/nv.3
+++ b/share/man/man9/nv.9
@@ -28,8 +28,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 2, 2015
-.Dt NV 3
+.Dd July 4, 2015
+.Dt NV 9
 .Os
 .Sh NAME
 .Nm nvlist_create ,