diff --git a/mysql/files/Debian-my.cnf b/mysql/files/Debian-my.cnf
index 2ec3049..520ea4b 100644
--- a/mysql/files/Debian-my.cnf
+++ b/mysql/files/Debian-my.cnf
@@ -33,10 +33,10 @@ nice		= 0
 #
 # * Basic Settings
 #
-user		= {{ salt['pillar.get']('mysql:user', 'mysql') }}
+user		= {{ salt['pillar.get']('mysql:server:user', 'mysql') }}
 pid-file	= /var/run/mysqld/mysqld.pid
 socket		= /var/run/mysqld/mysqld.sock
-port		= {{ salt['pillar.get']('mysql:port', '3306') }}
+port		= {{ salt['pillar.get']('mysql:server:port', '3306') }}
 basedir		= /usr
 datadir		= /var/lib/mysql
 tmpdir		= /tmp
@@ -45,7 +45,7 @@ skip-external-locking
 #
 # Instead of skip-networking the default is now to listen only on
 # localhost which is more compatible and is not less secure.
-bind-address		= {{ salt['pillar.get']('mysql:bind-address', '127.0.0.1') }}
+bind-address		= {{ salt['pillar.get']('mysql:server:bind-address', '127.0.0.1') }}
 #
 # * Fine Tuning
 #
diff --git a/mysql/files/Gentoo-my.cnf b/mysql/files/Gentoo-my.cnf
index 63503bf..ba236b1 100644
--- a/mysql/files/Gentoo-my.cnf
+++ b/mysql/files/Gentoo-my.cnf
@@ -45,8 +45,8 @@ err-log						= /var/log/mysql/mysql.err
 # add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
 [mysqld]
 character-set-server		= utf8
-user 						= {{ salt['pillar.get']('mysql:user', 'mysql') }}
-port 						= {{ salt['pillar.get']('mysql:port', '3306') }}
+user 						= {{ salt['pillar.get']('mysql:server:user', 'mysql') }}
+port 						= {{ salt['pillar.get']('mysql:server:port', '3306') }}
 socket 						= /var/run/mysqld/mysqld.sock
 pid-file 					= /var/run/mysqld/mysqld.pid
 log-error 					= /var/log/mysql/mysqld.err
@@ -66,7 +66,7 @@ language 					= /usr/share/mysql/english
 # security:
 # using "localhost" in connects uses sockets by default
 # skip-networking
-bind-address				= {{ salt['pillar.get']('mysql:bind-address', '127.0.0.1') }}
+bind-address				= {{ salt['pillar.get']('mysql:server:bind-address', '127.0.0.1') }}
 
 log-bin
 server-id 					= 1
diff --git a/mysql/files/Ubuntu-my.cnf b/mysql/files/Ubuntu-my.cnf
index 406f05d..25ecb96 100644
--- a/mysql/files/Ubuntu-my.cnf
+++ b/mysql/files/Ubuntu-my.cnf
@@ -33,10 +33,10 @@ nice		= 0
 #
 # * Basic Settings
 #
-user		= {{ salt['pillar.get']('mysql:user', 'mysql') }}
+user		= {{ salt['pillar.get']('mysql:server:user', 'mysql') }}
 pid-file	= /var/run/mysqld/mysqld.pid
 socket		= /var/run/mysqld/mysqld.sock
-port		= {{ salt['pillar.get']('mysql:port', '3306') }}
+port		= {{ salt['pillar.get']('mysql:server:port', '3306') }}
 basedir		= /usr
 datadir		= /var/lib/mysql
 tmpdir		= /tmp
@@ -45,7 +45,7 @@ skip-external-locking
 #
 # Instead of skip-networking the default is now to listen only on
 # localhost which is more compatible and is not less secure.
-bind-address		= {{ salt['pillar.get']('mysql:bind-address', '127.0.0.1') }}
+bind-address		= {{ salt['pillar.get']('mysql:server:bind-address', '127.0.0.1') }}
 #
 # * Fine Tuning
 #
diff --git a/mysql/package-map.jinja b/mysql/package-map.jinja
index 880ff67..8f78661 100644
--- a/mysql/package-map.jinja
+++ b/mysql/package-map.jinja
@@ -20,4 +20,4 @@
         'config': '/etc/mysql/my.cnf',
         'python': 'dev-python/mysql-python',
     },
-}, merge=salt['pillar.get']('mysql:lookup')) %}
+}) %}