diff --git a/ChangeLog b/ChangeLog
index 229ef3b..505bbf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-25 - 0.0.3.1
+* Fix bugs
+* Use ubuntu ppa for glusterfs 3.6
+
 2013-05-24 - 0.0.3
 * Update README and use markdown.
 * Change to 2-space indent.
diff --git a/manifests/client.pp b/manifests/client.pp
index 1088e1e..49c271f 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -4,7 +4,11 @@
 #
 class glusterfs::client {
 
-  package { 'glusterfs-fuse': ensure => installed }
+  require glusterfs::ppa
+
+  package { 'glusterfs-client':
+    ensure => installed,
+  }
 
 }
 
diff --git a/manifests/mount.pp b/manifests/mount.pp
index 649a602..da0320c 100644
--- a/manifests/mount.pp
+++ b/manifests/mount.pp
@@ -20,7 +20,8 @@
     device  => $device,
     fstype  => 'glusterfs',
     options => $options,
-    require => Package['glusterfs-fuse'],
+    remounts => false,
+    require => Package['glusterfs-client'],
   }
 
 }
diff --git a/manifests/peer.pp b/manifests/peer.pp
index 028cd30..9a7af4b 100644
--- a/manifests/peer.pp
+++ b/manifests/peer.pp
@@ -8,7 +8,7 @@
 
   exec { "/usr/sbin/gluster peer probe ${title}":
     unless  => "/bin/egrep '^hostname.+=${title}$' /var/lib/glusterd/peers/*",
-    require => Service['glusterd'],
+    require => Service['glusterfs-server'],
   }
 
 }
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
new file mode 100644
index 0000000..20b3418
--- /dev/null
+++ b/manifests/ppa.pp
@@ -0,0 +1,12 @@
+class glusterfs::ppa(
+  $ppa = 'ppa:gluster/glusterfs-3.4'
+) {
+
+  include apt
+
+  apt::ppa { $ppa: 
+  }
+
+}
+
+
diff --git a/manifests/server.pp b/manifests/server.pp
index 1aad37e..37b9ad6 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -15,12 +15,15 @@
 #  }
 #
 class glusterfs::server (
-  $peers = []
+  $peers = [],
+  $ensure = 'installed'
 ) {
 
+  require glusterfs::ppa
+
   # Main package and service it provides
-  package { 'glusterfs-server': ensure => installed }
-  service { 'glusterd':
+  package { 'glusterfs-server': ensure => $installed }
+  service { 'glusterfs-server':
     enable    => true,
     ensure    => running,
     hasstatus => true,
diff --git a/manifests/volume.pp b/manifests/volume.pp
index 7a6ae2b..a96ccd1 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -18,7 +18,7 @@
   }
 
   exec { "/usr/sbin/gluster volume start ${title}":
-    unless  => "[ \"`gluster volume info ${title} | egrep '^Status:'`\" = 'Status: Started' ]",
+    unless  => "gluster volume info ${title} | grep -q '^Status: Started'",
     path    => [ '/usr/sbin', '/usr/bin', '/sbin', '/bin' ],
     require => Exec["gluster volume create ${title}"],
   }