diff --git a/SPECS/systemtap/systemtap.spec b/SPECS/systemtap/systemtap.spec
index 27b25e6947..3bdb43dd3c 100644
--- a/SPECS/systemtap/systemtap.spec
+++ b/SPECS/systemtap/systemtap.spec
@@ -22,6 +22,16 @@ BuildSystem:    autotools
 
 BuildOption(conf):  --disable-docs
 BuildOption(conf):  --with-python3
+%if %{with avahi}
+BuildOption(conf):  --with-avahi
+%else
+BuildOption(conf):  --without-avahi
+%endif
+%if %{with dyninst}
+BuildOption(conf):  --with-dyninst
+%else
+BuildOption(conf):  --without-dyninst
+%endif
 
 BuildRequires:  config
 BuildRequires:  make
@@ -38,7 +48,7 @@ BuildRequires:  pkgconfig(json-c)
 BuildRequires:  dyninst-devel
 BuildRequires:  pkgconfig(libselinux)
 %endif
-BuildRequires:  sqlite-devel
+BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  python3
 BuildRequires:  python3-devel
@@ -87,9 +97,6 @@ subpackage instead.
 
 %package        server
 Summary:        Instrumentation System Server
-%if %{with avahi}
-BuildRequires:  avahi-devel
-%endif
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       openssl
 Requires:       systemd