diff --git a/.yamllint b/.yamllint
index 79d4cf0deb6178ef5076c286724944d3c5aa78fd..7aad9b3e6a2792538e8c8ae3cbd6ecf3a842b784 100644
--- a/.yamllint
+++ b/.yamllint
@@ -20,6 +20,7 @@ ignore: |
   .kitchen/
   kitchen.vagrant.yml
   mysql/supported_sections.yaml
+  mysql/osfingermap.yaml
 
 yaml-files:
   # Default settings
diff --git a/mysql/osfingermap.yaml b/mysql/osfingermap.yaml
index e2a92a1b966b0f0d17933ed89830c702206710cf..778aa05fab2e09a9939829f9279f079d45eefa1b 100644
--- a/mysql/osfingermap.yaml
+++ b/mysql/osfingermap.yaml
@@ -62,7 +62,11 @@ CentOS-6:
   pythonpkg: MySQL-python
 CentOS Linux-7:
   # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
+      {%- if 'pythonversion' in grains and grains.pythonversion[0]|int == 3 %}
+  pythonpkg: python36-PyMySQL   # python36-mysql works too
+      {%- else %}
   pythonpkg: MySQL-python
+      {%- endif %}
   serverpkg: mariadb-server
   service: mariadb
   clientpkg: mariadb