diff --git a/mariadb10.11.spec b/mariadb10.11.spec
index 1ea37a9..4ecbfce 100644
--- a/mariadb10.11.spec
+++ b/mariadb10.11.spec
@@ -63,11 +63,16 @@
 # For deep debugging we need to build binaries with extra debug info
 %bcond_with    debug
 
+# Authentication plugins
 %bcond_without gssapi
-# PAM authentication plugin
 %if !0%{?flatpak}
 %bcond_without pam
 %endif
+%if 0%{?fedora}
+%bcond_without hashicorp
+%else
+%bcond_with hashicorp
+%endif
 
 # The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
 # hierarchies and more complex graph structures to be handled in a relational fashion
@@ -935,10 +940,10 @@ fi
          -DPLUGIN_COLUMNSTORE=NO \
          -DPLUGIN_CLIENT_ED25519=OFF \
          -DPLUGIN_CACHING_SHA2_PASSWORD=%{?with_clibrary:DYNAMIC}%{!?with_clibrary:OFF} \
-         -DPLUGIN_AWS_KEY_MANAGEMENT=NO \
+         -DPLUGIN_AWS_KEY_MANAGEMENT=OFF \
          -DCONNECT_WITH_MONGO=OFF \
          -DCONNECT_WITH_JDBC=OFF \
-         -DPLUGIN_HASHICORP_KEY_MANAGEMENT=NO \
+         -DPLUGIN_HASHICORP_KEY_MANAGEMENT=%{?with_hashicorp:DYNAMIC}%{!?with_hashicorp:NO} \
 %{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON}
 
 # The -DSECURITY_HARDENED is used to force a set of compilation flags for hardening
@@ -1517,7 +1522,7 @@ fi
 %{?with_lzo:%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lzo.cnf}
 %{?with_snappy:%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_snappy.cnf}
 
-#%%config(noreplace) %%{_sysconfdir}/my.cnf.d/hashicorp_key_management.cnf
+%{?with_hashicorp:%config(noreplace) %{_sysconfdir}/my.cnf.d/hashicorp_key_management.cnf}
 
 %{_sbindir}/mysqld
 %{_sbindir}/mariadbd