diff --git a/expect.spec b/expect.spec
index b8aaebc..0553e06 100644
--- a/expect.spec
+++ b/expect.spec
@@ -5,7 +5,7 @@
 Summary: A program-script interaction and testing utility
 Name: expect
 Version: %{majorver}
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Public Domain
 URL: https://core.tcl.tk/expect/index
 Source: http://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
@@ -130,6 +130,12 @@ rm -f "$RPM_BUILD_ROOT"%{_bindir}/{cryptdir,decryptdir}
 rm -f "$RPM_BUILD_ROOT"%{_mandir}/man1/{cryptdir,decryptdir}.1*
 rm -f "$RPM_BUILD_ROOT"%{_bindir}/autopasswd
 
+# rename mkpasswd, as it collides with more powerful variant from whois package (bug 1649456)
+mv "$RPM_BUILD_ROOT"%{_bindir}/mkpasswd "$RPM_BUILD_ROOT"%{_bindir}/mkpasswd-expect
+mv "$RPM_BUILD_ROOT"%{_mandir}/man1/mkpasswd.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/mkpasswd-expect.1
+sed -i 's/mkpasswd/mkpasswd-expect/g;s/MKPASSWD/MKPASSWD-EXPECT/g' "$RPM_BUILD_ROOT"%{_mandir}/man1/mkpasswd-expect.1
+sed -i 's/mkpasswd/mkpasswd-expect/g' "$RPM_BUILD_ROOT"%{_bindir}/mkpasswd-expect
+
 # remove rpath
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
 
@@ -142,7 +148,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
 %{_bindir}/ftp-rfc
 %{_bindir}/kibitz
 %{_bindir}/lpunlock
-%{_bindir}/mkpasswd
+%{_bindir}/mkpasswd-expect
 %{_bindir}/passmass
 %{_bindir}/rftp
 %{_bindir}/rlogin-cwd
@@ -159,7 +165,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
 %{_mandir}/man1/dislocate.1.gz
 %{_mandir}/man1/expect.1.gz
 %{_mandir}/man1/kibitz.1.gz
-%{_mandir}/man1/mkpasswd.1.gz
+%{_mandir}/man1/mkpasswd-expect.1.gz
 %{_mandir}/man1/passmass.1.gz
 %{_mandir}/man1/unbuffer.1.gz
 %{_mandir}/man1/xkibitz.1.gz
@@ -177,6 +183,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
 %{_mandir}/man1/tknewsbiff.1*
 
 %changelog
+* Thu Nov 22 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-8
+- Rename mkpasswd to mkpasswd-expect
+  Resolves: #1649456
+
 * Wed Oct 10 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.45.4-7
 - Fix issues detected by static analysis