diff --git a/mercurial.spec b/mercurial.spec
index 6a6cd65..af02323 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -1,7 +1,7 @@
 Summary: Mercurial -- a distributed SCM
 Name: mercurial
 Version: 5.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # Release: 1.rc1%%{?dist}
 
@@ -239,6 +239,11 @@ touch %{buildroot}%{_bindir}/hg
 touch %{buildroot}%{_bindir}/hg-ssh
 
 %post py2
+for fname in %{_bindir}/{hg,hg-ssh}; do
+  if [ ! -L "$fname" ]; then
+    rm -f "$fname"
+  fi
+done
 %{_sbindir}/update-alternatives --install %{_bindir}/hg \
   hg %{_bindir}/hg2 %{py2_priority} \
   --slave %{_bindir}/hg-ssh hg-ssh %{_bindir}/hg-ssh2 || :
@@ -250,6 +255,11 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post py3
+for fname in %{_bindir}/{hg,hg-ssh}; do
+  if [ ! -L "$fname" ]; then
+    rm -f "$fname"
+  fi
+done
 %{_sbindir}/update-alternatives --install %{_bindir}/hg \
   hg %{_bindir}/hg3 %{py3_priority} \
   --slave %{_bindir}/hg-ssh hg-ssh %{_bindir}/hg-ssh3 || :
@@ -322,6 +332,11 @@ fi
 
 
 %changelog
+* Mon Aug 10 2020 Petr Stodulka <pstodulk@redhat.com> - 5.4-3
+- Fix upgrade from previous mercurial 4.9 causing broken alternatives for
+  mercurial
+- Resolves: #1831562
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild