diff --git a/manifests/client.pp b/manifests/client.pp
index 1088e1e..5562f1c 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -4,7 +4,13 @@
 #
 class glusterfs::client {
 
-  package { 'glusterfs-fuse': ensure => installed }
+  package { 'glusterfs-fuse':
+    ensure => installed,
+    name      => $::osfamily ? {
+      debian  => 'glusterfs-client',
+      default => 'glusterfs-fuse'
+    }
+  }
 
 }
 
diff --git a/manifests/peer.pp b/manifests/peer.pp
index 028cd30..6551661 100644
--- a/manifests/peer.pp
+++ b/manifests/peer.pp
@@ -6,8 +6,13 @@
 #
 define glusterfs::peer () {
 
+  $peer_dir = $::osfamily ? {
+    debian  => '/etc/glusterd/peers',
+    default => '/var/lib/glusterd/peers'
+  }
+
   exec { "/usr/sbin/gluster peer probe ${title}":
-    unless  => "/bin/egrep '^hostname.+=${title}$' /var/lib/glusterd/peers/*",
+    unless  => "/bin/egrep '^hostname.+=${title}$' ${peer_dir}/*",
     require => Service['glusterd'],
   }
 
diff --git a/manifests/server.pp b/manifests/server.pp
index 1aad37e..afbff15 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -24,6 +24,10 @@
     enable    => true,
     ensure    => running,
     hasstatus => true,
+    name      => $::osfamily ? {
+      debian  => 'glusterfs-server',
+      default => 'glusterd'
+    },
     require   => Package['glusterfs-server'],
   }
 
diff --git a/manifests/volume.pp b/manifests/volume.pp
index 253f4ae..0ec7ad5 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -11,9 +11,14 @@
   $create_options
 ) {
 
+  $vols_dir = $::osfamily ? {
+    debian  => '/etc/glusterd/vols',
+    default => '/var/lib/glusterd/vols'
+  }
+
   exec { "gluster volume create ${title}":
     command => "/usr/sbin/gluster volume create ${title} ${create_options}",
-    creates => "/var/lib/glusterd/vols/${title}",
+    creates => "${vols_dir}/${title}",
     require => Class['glusterfs::server'],
   }