diff --git a/gpgme.spec b/gpgme.spec
index f0a399d..05a11ed 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -20,15 +20,15 @@
 %if "%{flavor}" == ""
 %bcond_without python2
 %bcond_without python3
+%bcond_with qt
+%define psuffix -qt
 %else
 %bcond_with python2
 %bcond_with python3
+%bcond_without qt
+%define psuffix %{nil}
 %endif
-%if "%{flavor}" == "qt"
-Name:           libqgpgme
-%else
-Name:           gpgme
-%endif
+Name:           gpgme%{psuffix}
 Version:        1.13.1
 Release:        0
 Summary:        Programmatic library interface to GnuPG
@@ -55,10 +55,10 @@ BuildRequires:  python2-devel >= 2.7
 %if %{with python3}
 BuildRequires:  python3-devel >= 3.4
 %endif
-%if "%{flavor}" == "qt"
+%if %{with qt}
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Test)
-%endif # qt
+%endif
 
 %description
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
@@ -196,9 +196,9 @@ languages="cl cpp"
 languages="${languages} python"
 %endif
 
-%if "%{flavor}" == "qt"
+%if %{with qt}
 languages="cpp qt"
-%endif # qt
+%endif
 
 %configure \
 	--disable-silent-rules \
@@ -223,7 +223,7 @@ find %{buildroot}%{python3_sitearch}/gpg-*.egg-info -delete -print
 rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt
 find %{buildroot}%{python3_sitearch}/gpg -type f -name "*.pyc" -delete -print
 %endif
-%if "%{flavor}" == "qt"
+%if %{with qt}
 rm -r %{buildroot}%{_bindir}
 rm -r %{buildroot}%{_datadir}/aclocal/gpgme*
 rm -r %{buildroot}%{_includedir}/gpgme*
@@ -238,10 +238,12 @@ rm -r %{buildroot}%{_libdir}/pkgconfig/gpgme*
 make %{?_smp_mflags} check
 %endif
 
-%if "%{flavor}" == "qt"
+%if %{with qt}
 %post -n libqgpgme7 -p /sbin/ldconfig
 %postun -n libqgpgme7 -p /sbin/ldconfig
-%else
+%endif
+
+%if !%{with qt}
 %post -n libgpgme11 -p /sbin/ldconfig
 %postun -n libgpgme11 -p /sbin/ldconfig
 %post -n libgpgmepp6 -p /sbin/ldconfig
@@ -252,7 +254,9 @@ make %{?_smp_mflags} check
 
 %preun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/gpgme.info%{ext_info}
+%endif
 
+%if !%{with qt}
 %files
 %license COPYING COPYING.LESSER
 %doc AUTHORS ChangeLog ChangeLog-2011 README NEWS THANKS TODO VERSION
@@ -282,6 +286,7 @@ make %{?_smp_mflags} check
 %dir %{_libdir}/cmake
 %dir %{_libdir}/cmake/Gpgmepp
 %{_libdir}/cmake/Gpgmepp/GpgmeppConfig*.cmake
+%endif
 
 %if %{with python2}
 %files -n python2-gpg
@@ -292,9 +297,8 @@ make %{?_smp_mflags} check
 %files -n python3-gpg
 %{python3_sitearch}/gpg
 %endif
-%endif # qt
 
-%if "%{flavor}" == "qt"
+%if %{with qt}
 %files -n libqgpgme7
 %{_libdir}/libqgpgme.so.*
 
@@ -305,6 +309,6 @@ make %{?_smp_mflags} check
 %dir %{_libdir}/cmake/QGpgme
 %{_libdir}/cmake/QGpgme/*.cmake
 %{_libdir}/libqgpgme.so
-%endif # qt
+%endif
 
 %changelog