diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index cc0502b..d437974 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -101,6 +101,35 @@ supports access control lists on mailboxes and storage quotas on mailbox
 hierarchies.
 
 
+%package devel
+Summary: Cyrus IMAP server development files
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+The %{name}-devel package contains header files and libraries
+necessary for developing applications which use the imclient library.
+
+
+%package doc-extra
+Summary: Extra documentation for the Cyrus IMAP server
+BuildArch: noarch
+
+%description doc-extra
+This package contains the HTML documentation for the Cyrus IMAP server, as well
+as some legacy and internal documentation not useful for normal operation of
+the server.
+
+
+%package utils
+Summary: Cyrus IMAP server administration utilities
+
+%description utils
+The cyrus-imapd-utils package contains administrative tools for the
+Cyrus IMAP server. It can be installed on systems other than the
+one running the server.
+
+
 %package vzic
 Summary: Utilities to convert timezone database files
 License: GPLv2+
@@ -122,23 +151,6 @@ This package contains a forked version of vzic for internal use by the Cyrus
 IMAP server.
 
 
-%package devel
-Summary: Cyrus IMAP server development files
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pkgconfig
-
-%description devel
-The %{name}-devel package contains header files and libraries
-necessary for developing applications which use the imclient library.
-
-%package utils
-Summary: Cyrus IMAP server administration utilities
-
-%description utils
-The cyrus-imapd-utils package contains administrative tools for the
-Cyrus IMAP server. It can be installed on systems other than the
-one running the server.
-
 %prep
 %autosetup -p1
 tar xf %SOURCE1
@@ -149,6 +161,7 @@ install -m 644 %SOURCE21 doc/
 # Fix permissions on perl programs
 #find . -type f -name "*.pl" -exec chmod 755 {} \;
 
+
 %build
 
 # This is the test suite, which doesn't build much but does verify its dependencies.
@@ -362,9 +375,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 /sbin/ldconfig
 %systemd_postun_with_restart cyrus-imapd.service
 
+
 %files
 %license COPYING
-%doc README.md doc/*
+%doc README.md doc/README.* doc/examples doc/text
 
 %_datadir/cyrus-imapd
 %_libdir/libcyrus*.so.*
@@ -405,15 +419,17 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 %attr(0700,%cyrususer,%cyrusgroup) /var/spool/imap/
 
 
-%files vzic
-%cyrexecdir/vzic*
-
 %files devel
 %_includedir/cyrus/
 %_libdir/libcyrus*.so
 %_libdir/pkgconfig/*.pc
 %_mandir/man3/imclient.3*
 
+
+%files doc-extra
+%doc doc/html doc/internal doc/legacy
+
+
 %files utils
 %license COPYING
 %doc perl/imap/README
@@ -427,6 +443,11 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 %{_mandir}/man3/*.3pm*
 %{_mandir}/man1/*
 
+
+%files vzic
+%cyrexecdir/vzic*
+
+
 %changelog
 * Thu Apr 20 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-1
 - Initial attempt at importing 3.0.  Many new dependencies.