diff --git a/bind.spec b/bind.spec
index ee7f5ff..f5e8686 100644
--- a/bind.spec
+++ b/bind.spec
@@ -17,7 +17,6 @@
 %bcond_without DEVEL
 %bcond_without LMDB
 %bcond_without JSON
-%bcond_without DNSTAP
 %bcond_with    BDB
 # skip DLZ for now
 %bcond_without DLZ
@@ -25,8 +24,10 @@
 %bcond_without GEOIP2
 %if 0%{?fedora} >= 28
 %bcond_without UNITTEST
+%bcond_without DNSTAP
 %else
 %bcond_with    UNITTEST
+%bcond_with    DNSTAP
 %endif
 %bcond_with    TSAN
 
@@ -416,7 +417,7 @@ BuildArch: noarch
 This package provides a module which allows commands to be sent to rndc directly from Python programs.
 
 %prep
-%if 0%{?fedora}
+%if 0%{?gpgverify:1}
 # RHEL does not yet support this verification
 %{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE0}'
 %endif