diff --git a/mysql/files/my.cnf b/mysql/files/my.cnf
index 2362361..8061974 100644
--- a/mysql/files/my.cnf
+++ b/mysql/files/my.cnf
@@ -1,5 +1,5 @@
 [mysqld]
-datadir=/var/lib/mysql
+datadir=/srv/mysql
 socket=/var/lib/mysql/mysql.sock
 user=mysql
 # Default to using old password format for compatibility with mysql 3.x
diff --git a/mysql/manifests/init.pp b/mysql/manifests/init.pp
index 978525c..084d9d0 100644
--- a/mysql/manifests/init.pp
+++ b/mysql/manifests/init.pp
@@ -18,10 +18,33 @@ class mysql::server {
 	ensure => installed,
     }
 
+    if $mysql_datadir {
+        file { "${mysql_datadir}":
+            ensure  => directory,
+            mode    => 0755,
+            owner   => mysql,
+            group   => mysql,
+            require => Package["mysql-server"],
+        }
+        file { "/srv/mysql":
+            ensure  => link,
+            target  => "${mysql_datadir}",
+            require => File["${mysql_datadir}"],
+        }
+    } else {
+        file { "/srv/mysql":
+            ensure  => directory,
+            mode    => 0755,
+            owner   => mysql,
+            group   => mysql,
+            require => Package["mysql-server"],
+        }
+    }
+
     service { "mysqld":
 	ensure  => running,
 	enable  => true,
-	require => Package["mysql-server"],
+	require => File["/srv/mysql"],
     }
 
     file { "/etc/my.cnf":