diff --git a/samba.changes b/samba.changes
index 52bf5f2..a64abc6 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 30 17:18:54 UTC 2017 - dmulder@suse.com
+
+- Build and install the html man pages (bsc#1021907).
+
 -------------------------------------------------------------------
 Wed Mar 22 13:15:12 UTC 2017 - jmcdonough@suse.com
 
diff --git a/samba.spec b/samba.spec
index ac808fd..ee71455 100644
--- a/samba.spec
+++ b/samba.spec
@@ -28,6 +28,7 @@
 %endif
 
 Name:           samba
+BuildRequires:  autoconf
 BuildRequires:  cups-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  e2fsprogs-devel
@@ -1151,6 +1152,11 @@ CONFIGURE_OPTIONS="\
 make %{build_make_smp_mflags} \
 	all
 
+pushd docs-xml
+autoconf && ./configure
+XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" make htmlman
+popd
+
 pushd pidl
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 popd
@@ -1353,6 +1359,7 @@ install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/
 install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop
 install -d -m 0755 -p ../docs/htmldocs
 install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html
+install -m 0644 ../docs-xml/output/htmldocs/manpages/* ../docs/htmldocs/
 popd
 # winbind stuff
 install -m 0644 examples/pam_winbind/pam_winbind.conf %{buildroot}/%{_sysconfdir}/security/pam_winbind.conf