diff --git a/Makefile.am b/Makefile.am
index e9c6c36d6c..f6d4121aed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/config/rpm.am
 
 if CONFIG_USER
-USER_DIR = config doc scripts lib cmd
+USER_DIR = config man scripts lib cmd
 endif
 if CONFIG_KERNEL
 KERNEL_DIR = module
diff --git a/configure.ac b/configure.ac
index 97ab137297..7bc41dc225 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,8 @@ ZFS_AC_DEBUG
 AC_CONFIG_FILES([ 
 	Makefile
 	config/Makefile
-	doc/Makefile
+	man/Makefile
+	man/man8/Makefile
 	lib/Makefile
 	lib/libavl/Makefile
 	lib/libefi/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 07f6386f45..0000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = LEGAL
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000000..1602da1071
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = man8
diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
new file mode 100644
index 0000000000..8f0227f884
--- /dev/null
+++ b/man/man8/Makefile.am
@@ -0,0 +1,5 @@
+man_MANS = zdb.8 zfs.8 zpool.8
+EXTRA_DIST = $(man_MANS)
+
+install-data-local:
+	$(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man8"
diff --git a/zfs.spec.in b/zfs.spec.in
index 1444f270dd..1bbcb7f76c 100644
--- a/zfs.spec.in
+++ b/zfs.spec.in
@@ -63,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc OPENSOLARIS.LICENSE README TODO ZFS.RELEASE
 %{_sbindir}/*
 %{_libdir}/*
+%{_mandir}/man8/*
 
 %files devel
 %defattr(-,root,root)