diff --git a/mutt.spec b/mutt.spec
index a8a5da6..cbe8eb4 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -7,7 +7,11 @@
 %bcond_without sasl
 %bcond_without idn
 %bcond_without hcache
+%if 0%{?fedora} > 24
+%bcond_with tokyocabinet
+%else
 %bcond_without tokyocabinet
+%endif
 %bcond_with bdb
 %bcond_with qdbm
 %bcond_with gdbm
@@ -19,7 +23,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.8.3
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -40,7 +44,9 @@ Requires: mailcap, urlview
 BuildRequires: ncurses-devel, gettext, automake
 # manual generation
 BuildRequires: /usr/bin/xsltproc, docbook-style-xsl, perl
+%if 0%{?fedora} > 23 || 0%{?rhel} > 6
 BuildRequires: perl-generators
+%endif
 # html manual -> txt manual conversion (lynx messes up the encoding)
 BuildRequires: w3m
 
@@ -83,7 +89,9 @@ autoreconf --install
 %patch2 -p1 -b .cabundle
 %patch3 -p1 -b .syncdebug
 %patch8 -p1 -b .system_certs
+%if 0%{?fedora} > 24
 %patch9 -p1 -b .ssl_ciphers
+%endif
 
 sed -i -r 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
 # disable mutt_dotlock program - remove support from mutt binary