diff --git a/SPECS/whois.spec b/SPECS/whois.spec
index eb4242b..472c620 100644
--- a/SPECS/whois.spec
+++ b/SPECS/whois.spec
@@ -1,5 +1,5 @@
 # Package mkpasswd tool
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} < 9
 %{bcond_with whois_enables_mkpasswd}
 %else
 %{bcond_without whois_enables_mkpasswd}
@@ -11,7 +11,7 @@
 
 Name:       whois       
 Version:    5.5.9
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Improved WHOIS client
 License:    GPLv2+
 URL:        http://www.linux.it/~md/software/
@@ -133,12 +133,16 @@ fi
 %if %{with whois_enables_mkpasswd}
 %files -n mkpasswd
 %license COPYING debian/copyright
-%doc README debian/changelog
+%doc README
 %{_bindir}/mkpasswd
 %{_mandir}/man1/mkpasswd.*
 %endif
 
 %changelog
+* Fri Apr 22 2022 Petr Menšík <pemensik@redhat.com> - 5.5.9-4
+- Enable mkpasswd building (#2054043)
+- Remove changelog from mkpasswd, it has double size of actual tool
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.5.9-3
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688