diff --git a/whois.spec b/whois.spec
index 197bd23..e906fba 100644
--- a/whois.spec
+++ b/whois.spec
@@ -7,7 +7,7 @@
 
 Name:       whois       
 Version:    5.4.0
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Improved WHOIS client
 License:    GPLv2+
 URL:        http://www.linux.it/~md/software/
@@ -52,13 +52,16 @@ whois.networksolutions.com for NIC handles or whois.arin.net for IPv4
 addresses and network names.
 
 %if %{with whois_enables_mkpasswd}
-%package mkpasswd
+%package -n mkpasswd
 Summary:    Encrypt a password with crypt(3) function using a salt
-# /usr/bin/mkpasswd is provided by "expect" package, bug 1649426
-Conflicts:  expect
+# /usr/bin/mkpasswd was provided by "expect" package, bug 1649426
+Conflicts:  expect < 5.45.4-8.fc30
 Requires:   whois-nls = %{version}-%{release}
+# whois-mkpasswd package renamed to mkpasswd, bug #bug 1649426
+Obsoletes:  whois-mkpasswd <= 5.4.0-1.fc30
+Provides:   whois-mkpasswd = %{version}-%{release}
 
-%description mkpasswd
+%description -n mkpasswd
 mkpasswd tool encrypts a given password with the crypt(3) libc function
 using a given salt.
 %endif
@@ -122,7 +125,7 @@ fi
 %files nls -f %{name}.lang
 
 %if %{with whois_enables_mkpasswd}
-%files mkpasswd
+%files -n mkpasswd
 %license COPYING debian/copyright
 %doc README debian/changelog
 %{_bindir}/mkpasswd
@@ -130,6 +133,9 @@ fi
 %endif
 
 %changelog
+* Mon Nov 26 2018 Petr Pisar <ppisar@redhat.com> - 5.4.0-2
+- Rename whois-mkpasswd package to mkpasswd (bug #1649456)
+
 * Wed Nov 14 2018 Petr Pisar <ppisar@redhat.com> - 5.4.0-1
 - 5.4.0 bump