diff --git a/states/mariadb/config.sls b/states/mariadb/config.sls
index fd01da5..e99221c 100644
--- a/states/mariadb/config.sls
+++ b/states/mariadb/config.sls
@@ -1,6 +1,6 @@
 ---
 {%- from "mariadb/map.jinja" import mariadb with context %}
-mariadb-config:
+mariadb-config-server:
   file.managed:
     - name: /etc/mysql/mariadb.conf.d/51-server.cnf
     - source: salt://mariadb/templates/server.cnf.j2
@@ -13,3 +13,15 @@ mariadb-config:
       - pip: mariadb-install-pip-pkgs
     - watch_in:
       - service: mariadb-service
+
+mariadb-config-client:
+  file.managed:
+    - name: /etc/mysql/mariadb.conf.d/51-client.cnf
+    - source: salt://mariadb/templates/client.cnf.j2
+    - user: root
+    - group: root
+    - mode: 0644
+    - template: jinja
+    - require:
+      - pkg: mariadb-install-pkgs
+      - pip: mariadb-install-pip-pkgs
diff --git a/states/mariadb/defaults.yaml b/states/mariadb/defaults.yaml
index d86c143..bc983ec 100644
--- a/states/mariadb/defaults.yaml
+++ b/states/mariadb/defaults.yaml
@@ -15,7 +15,11 @@ mariadb:
     - mysqlclient
   databases: {}
   users: {}
-  config:
+  client:
+    mysql:
+      options:
+        prompt: "\\u@\\h:\\d> "
+  server:
     mysqld:
       options:
         bind_address: 0.0.0.0
diff --git a/states/mariadb/templates/client.cnf.j2 b/states/mariadb/templates/client.cnf.j2
new file mode 100644
index 0000000..2b548cd
--- /dev/null
+++ b/states/mariadb/templates/client.cnf.j2
@@ -0,0 +1,9 @@
+## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
+
+{%- from "mariadb/map.jinja" import mariadb with context -%}
+{%- for section, elems in mariadb.client.items() %}
+[{{ section }}]
+{%- for key, value in elems.options.items() %}
+{{ key }}={{ value }}
+{%- endfor %}
+{%- endfor %}
diff --git a/states/mariadb/templates/server.cnf.j2 b/states/mariadb/templates/server.cnf.j2
index 9b879cf..7025f61 100644
--- a/states/mariadb/templates/server.cnf.j2
+++ b/states/mariadb/templates/server.cnf.j2
@@ -1,7 +1,7 @@
 ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
 
 {%- from "mariadb/map.jinja" import mariadb with context -%}
-{%- for section, elems in mariadb.config.items() %}
+{%- for section, elems in mariadb.server.items() %}
 [{{ section }}]
 {%- for key, value in elems.options.items() %}
 {{ key }}={{ value }}