diff --git a/manifests/client.pp b/manifests/client.pp
index cd342be..f375a51 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -1,12 +1,8 @@
 class mysql::client {
 
-  package{ 'mysql':
-    name => $operatingsystem ? {
-        'debian' => 'mysql-client',
-        default => 'mysql',
-    },
-    alias => 'mysql-client',
-    ensure => present,
+  case $operatingsystem {
+    debian: { include mysql::client::debian }
+    default: { include mysql::client::base }
   }
 
   if $use_shorewall {
diff --git a/manifests/client/base.pp b/manifests/client/base.pp
new file mode 100644
index 0000000..d992b0f
--- /dev/null
+++ b/manifests/client/base.pp
@@ -0,0 +1,8 @@
+class mysql::client::base {
+
+  package { 'mysql':
+    ensure => present,
+    alias => 'mysql-client',
+  }
+
+}
diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp
new file mode 100644
index 0000000..b400c4a
--- /dev/null
+++ b/manifests/client/debian.pp
@@ -0,0 +1,7 @@
+class mysql::client::debian inherits mysql::client::base {
+
+  Package['mysql'] {
+    name => 'mysql-client',
+  }
+
+}
diff --git a/manifests/client/ruby.pp b/manifests/client/ruby.pp
new file mode 100644
index 0000000..726f63d
--- /dev/null
+++ b/manifests/client/ruby.pp
@@ -0,0 +1,7 @@
+class mysql::client::ruby {
+
+  case $operatingsystem {
+    debian: { include mysql::client::ruby::debian }
+  }
+
+}
diff --git a/manifests/client/ruby/debian.pp b/manifests/client/ruby/debian.pp
new file mode 100644
index 0000000..3cfa846
--- /dev/null
+++ b/manifests/client/ruby/debian.pp
@@ -0,0 +1,7 @@
+class mysql::client::ruby::debian {
+
+  package { 'libmysql-ruby':
+    ensure => present,
+  }
+
+}
diff --git a/tests/run_tests b/tests/run_tests
old mode 100755
new mode 100644