diff --git a/mariadb.spec b/mariadb.spec
index c540990..b90c188 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1022,7 +1022,10 @@ unlink %{buildroot}%{_libdir}/libmysqlclient.so
 unlink %{buildroot}%{_libdir}/libmysqlclient_r.so
 unlink %{buildroot}%{_libdir}/libmariadb.so
 # Client plugins
-rm %{buildroot}%{_libdir}/%{pkg_name}/plugin/{dialog.so,mysql_clear_password.so,sha256_password.so,auth_gssapi_client.so}
+rm %{buildroot}%{_libdir}/%{pkg_name}/plugin/{dialog.so,mysql_clear_password.so,sha256_password.so}
+%if %{with gssapi}
+rm %{buildroot}%{_libdir}/%{pkg_name}/plugin/auth_gssapi_client.so
+%endif
 %endif
 
 %if %{without clibrary} || %{without devel}
@@ -1081,10 +1084,6 @@ rm %{buildroot}%{_sysconfdir}/my.cnf
 rm -r %{buildroot}%{_datadir}/%{pkg_name}/charsets
 %endif
 
-%if %{without gssapi}
-rm -r %{buildroot}/etc/my.cnf.d/auth_gssapi.cnf
-%endif
-
 %if %{without errmsg}
 rm %{buildroot}%{_datadir}/%{pkg_name}/errmsg-utf8.txt
 rm -r %{buildroot}%{_datadir}/%{pkg_name}/{english,czech,danish,dutch,estonian,\