diff --git a/zeromq.spec b/zeromq.spec
index 0bc3d97..d581cf4 100644
--- a/zeromq.spec
+++ b/zeromq.spec
@@ -26,6 +26,7 @@ BuildRequires:  openpgm-devel
 BuildRequires:  krb5-devel
 %endif
 
+# https://github.com/zeromq/libzmq/pull/4609 - Upgrade of CMake files
 Patch0:         zeromq-fix-cmake-warnings.patch
 
 %description
@@ -48,6 +49,12 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%package        doc
+Summary:        HTML documentation for the %{name} library
+BuildArch:      noarch
+
+%description    doc
+This package contains HTML pages for %{name}.
 
 %prep
 %autosetup -p1
@@ -68,6 +75,20 @@ chmod -x src/xsub.hpp
 %install
 %cmake_install
 
+# Doc
+mv -f %{buildroot}/usr/doc/zmq %{buildroot}%{_docdir}/
+
+# Manual pages
+install -d %{buildroot}%{_mandir}/{man3,man7}
+install -pm 0644 doc/*.3 %{buildroot}%{_mandir}/man3/
+install -pm 0644 doc/*.7 %{buildroot}%{_mandir}/man7/
+
+# Static library
+rm -f %{buildroot}%{_libdir}/libzmq.a
+
+# Unused binaries
+rm -f %{buildroot}%{_bindir}/{inproc_lat,inproc_thr,local_lat,local_thr,proxy_thr,remote_lat,remote_thr}
+
 %check
 %ifnarch s390x
 %ctest
@@ -79,7 +100,7 @@ make check V=1 || ( cat test-suite.log && exit 1 )
 %files
 %doc README.md AUTHORS NEWS
 %license LICENSE
-%{_bindir}/curve_keygen
+#%%{_bindir}/curve_keygen
 %{_libdir}/libzmq.so.5*
 %{_mandir}/man3/zmq_*
 %{_mandir}/man7/zmq_*
@@ -89,7 +110,10 @@ make check V=1 || ( cat test-suite.log && exit 1 )
 %{_libdir}/libzmq.so
 %{_libdir}/pkgconfig/libzmq.pc
 %{_includedir}/zmq*.h
-%{_libdir}/cmake/ZeroMQ
+%{_libdir}/cmake/ZeroMQ/
+
+%files doc
+%{_docdir}/zmq/
 
 %changelog
 %autochangelog