diff --git a/mandoc.changes b/mandoc.changes
index 1fd825d..2989ebf 100644
--- a/mandoc.changes
+++ b/mandoc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 16 14:43:39 CET 2019 - Matej Cepl <mcepl@suse.com>
+
+- Add %{_sbindir}/makewhatis to the alternatives mechanism to
+  avoid conflict with the mandoc package.
+
 -------------------------------------------------------------------
 Sun Mar 10 17:27:07 CET 2019 - Matej Cepl <mcepl@suse.com>
 
diff --git a/mandoc.spec b/mandoc.spec
index 14ea4af..0a90b30 100644
--- a/mandoc.spec
+++ b/mandoc.spec
@@ -64,6 +64,9 @@ for cmd in apropos man soelim ; do
     ln -s -f %{_sysconfdir}/alternatives/$cmd %{buildroot}%{_bindir}/$cmd
 done
 
+mv %{buildroot}%{_sbindir}/makewhatis{,.mandoc}
+ln -s -f %{_sysconfdir}/alternatives/makewhatis %{buildroot}%{_sbindir}/makewhatis
+
 # sec 1
 for man in apropos man soelim whatis ; do
     from=$(ls %{buildroot}%{_mandir}/man1/$man.1*)
@@ -84,6 +87,7 @@ update-alternatives --install \
    %{_bindir}/man man %{_bindir}/man.mandoc 1000 \
    --slave %{_bindir}/apropos apropos %{_bindir}/apropos.mandoc \
    --slave %{_bindir}/soelim soelim %{_bindir}/soelim.mandoc \
+   --slave %{_sbindir}/makewhatis makewhatis %{_sbindir}/makewhatis.mandoc \
    --slave %{_mandir}/man1/apropos.1%{?ext_man} apropos.1%{?ext_man} %{_mandir}/man1/apropos-mandoc.1%{?ext_man} \
    --slave %{_mandir}/man1/man.1%{?ext_man} man.1%{?ext_man} %{_mandir}/man1/man-mandoc.1%{?ext_man} \
    --slave %{_mandir}/man1/soelim.1%{?ext_man} soelim.1%{?ext_man} %{_mandir}/man1/soelim-mandoc.1%{?ext_man} \
@@ -108,7 +112,7 @@ fi
 %{_bindir}/man*
 %{_bindir}/soelim*
 %{_bindir}/whatis
-%{_sbindir}/makewhatis
+%{_sbindir}/makewhatis*
 %{_mandir}/man1/*.1%{?ext_man}
 %{_mandir}/man5/*.5%{?ext_man}
 %{_mandir}/man7/*.7%{?ext_man}
@@ -116,6 +120,7 @@ fi
 %ghost %{_sysconfdir}/alternatives/man
 %ghost %{_sysconfdir}/alternatives/apropos
 %ghost %{_sysconfdir}/alternatives/soelim
+%ghost %{_sysconfdir}/alternatives/makewhatis
 %ghost %{_sysconfdir}/alternatives/apropos.1%{?ext_man}
 %ghost %{_sysconfdir}/alternatives/man.1%{?ext_man}
 %ghost %{_sysconfdir}/alternatives/soelim.1%{?ext_man}