diff --git a/sendmail.spec b/sendmail.spec
index f163fbb..eaff0e8 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -21,7 +21,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.15.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -452,6 +452,8 @@ sed -i -e 's:%{maildir}/statistics:%{stdir}/statistics:' %{buildroot}%{_mandir}/
 # rename files for alternative usage
 mv %{buildroot}%{_sbindir}/sendmail %{buildroot}%{_sbindir}/sendmail.sendmail
 touch %{buildroot}%{_sbindir}/sendmail
+mv %{buildroot}%{_sbindir}/makemap %{buildroot}%{_sbindir}/makemap.sendmail
+touch %{buildroot}%{_sbindir}/makemap
 for i in mailq newaliases rmail; do
 	mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i.sendmail
 	touch %{buildroot}%{_bindir}/$i
@@ -466,6 +468,8 @@ mv %{buildroot}%{_mandir}/man8/sendmail.8 %{buildroot}%{_mandir}/man8/sendmail.s
 touch %{buildroot}%{_mandir}/man8/sendmail.8
 mv %{buildroot}%{_mandir}/man8/rmail.8 %{buildroot}%{_mandir}/man8/rmail.sendmail.8
 touch %{buildroot}%{_mandir}/man8/rmail.8
+mv %{buildroot}%{_mandir}/man8/makemap.8 %{buildroot}%{_mandir}/man8/makemap.sendmail.8
+touch %{buildroot}%{_mandir}/man8/makemap.8
 touch %{buildroot}/usr/lib/sendmail
 touch %{buildroot}%{_sysconfdir}/pam.d/smtp
 
@@ -489,6 +493,12 @@ getent group smmsp >/dev/null || \
 getent passwd smmsp >/dev/null || \
   %{_sbindir}/useradd -u 51 -g smmsp -d %{spooldir}/mqueue -r \
   -s %{smshell} smmsp >/dev/null 2>&1
+
+# hack to turn sbin/makemap and man8/makemap.8.gz into alternatives symlink
+# (part of the rhbz#1219178 fix), this could be probably dropped in f25+
+[ -h %{_sbindir}/makemap ] || rm -f %{_sbindir}/makemap || :
+[ -h %{_mandir}/man8/makemap.8.gz ] || rm -f %{_mandir}/man8/makemap.8.gz || :
+
 exit 0
 
 %postun
@@ -506,6 +516,7 @@ exit 0
 
 # Set up the alternatives files for MTAs.
 %{_sbindir}/alternatives --install %{_sbindir}/sendmail mta %{_sbindir}/sendmail.sendmail 90 \
+	--slave %{_sbindir}/makemap mta-makemap %{_sbindir}/makemap.sendmail \
 	--slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.sendmail \
 	--slave %{_bindir}/newaliases mta-newaliases %{_bindir}/newaliases.sendmail \
 	--slave %{_bindir}/rmail mta-rmail %{_bindir}/rmail.sendmail \
@@ -516,6 +527,7 @@ exit 0
 	--slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.sendmail.1.gz \
 	--slave %{_mandir}/man5/aliases.5.gz mta-aliasesman %{_mandir}/man5/aliases.sendmail.5.gz \
 	--slave %{_mandir}/man8/rmail.8.gz mta-rmailman %{_mandir}/man8/rmail.sendmail.8.gz \
+	--slave %{_mandir}/man8/makemap.8.gz mta-makemapman %{_mandir}/man8/makemap.sendmail.8.gz \
 	--initscript sendmail > /dev/null 2>&1
 
 # Rebuild maps.
@@ -572,7 +584,7 @@ fi
 %{_bindir}/makemap
 %{_bindir}/purgestat
 %{_sbindir}/mailstats
-%{_sbindir}/makemap
+%{_sbindir}/makemap.sendmail
 %{_sbindir}/praliases
 %attr(2755,root,smmsp) %{_sbindir}/sendmail.sendmail
 %{_bindir}/rmail.sendmail
@@ -584,7 +596,7 @@ fi
 %{_mandir}/man8/rmail.sendmail.8.gz
 %{_mandir}/man8/praliases.8.gz
 %{_mandir}/man8/mailstats.8.gz
-%{_mandir}/man8/makemap.8.gz
+%{_mandir}/man8/makemap.sendmail.8.gz
 %{_mandir}/man8/sendmail.sendmail.8.gz
 %{_mandir}/man8/smrsh.8.gz
 %{_mandir}/man8/hoststat.8.gz
@@ -595,6 +607,7 @@ fi
 
 # dummy attributes for rpmlint
 %ghost %attr(0755,-,-) %{_sbindir}/sendmail
+%ghost %attr(0755,-,-) %{_sbindir}/makemap
 %ghost %attr(0755,-,-) %{_bindir}/mailq
 %ghost %attr(0755,-,-) %{_bindir}/newaliases
 %ghost %attr(0755,-,-) %{_bindir}/rmail
@@ -606,6 +619,7 @@ fi
 %ghost %{_mandir}/man1/newaliases.1.gz
 %ghost %{_mandir}/man5/aliases.5.gz
 %ghost %{_mandir}/man8/rmail.8.gz
+%ghost %{_mandir}/man8/makemap.8.gz
 
 %dir %{stdir}
 %dir %{_sysconfdir}/smrsh
@@ -690,6 +704,10 @@ fi
 %endif
 
 %changelog
+* Wed May 27 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 8.15.1-5
+- Added makemap and its manual page into alternatives
+  Resolves: rhbz#1219178
+
 * Fri Mar 20 2015 Robert Scheck <robert@fedoraproject.org> - 8.15.1-4
 - Use uncompressed (new) IPv6 address format in block_bad_helo.m4