diff --git a/manifests/client/debian/install.pp b/manifests/client/debian/install.pp
index 0fc6646..e26f187 100644
--- a/manifests/client/debian/install.pp
+++ b/manifests/client/debian/install.pp
@@ -1,14 +1,20 @@
 class nfs::client::debian::install {
 
-  case $::lsbdistcodename {
-    'lucid': {
+  case $::operatingsystem  {
+    'Ubuntu': {     # Valid for version after lucid 
       package { 'portmap':
         ensure => installed,
       }
+
+     Package['portmap'] ->  Service ['portmap']
+
     } default: {
       package { 'rpcbind':
         ensure => installed,
       }
+
+     Package['rpcbind'] -> Service ['portmap']
+
     }
   }
 
diff --git a/manifests/server/debian.pp b/manifests/server/debian.pp
index 1d6d3f1..2b41f47 100644
--- a/manifests/server/debian.pp
+++ b/manifests/server/debian.pp
@@ -9,24 +9,5 @@
     nfs_v4_idmap_domain => $nfs_v4_idmap_domain,
   }
 
-  package { 'nfs-kernel-server':
-      ensure => 'installed',
-  }
-
-  if $nfs_v4 == true {
-    service {
-      'nfs-kernel-server':
-        ensure    => running,
-        subscribe => [
-          Concat['/etc/exports'],
-          Augeas['/etc/idmapd.conf', '/etc/default/nfs-common']
-          ],
-    }
-  } else {
-    service {
-    'nfs-kernel-server':
-      ensure    => running,
-      subscribe => Concat['/etc/exports'],
-    }
-  }
+  include nfs::server::debian::install, nfs::server::debian::service
 }
diff --git a/manifests/server/debian/install.pp b/manifests/server/debian/install.pp
new file mode 100644
index 0000000..5fa1c73
--- /dev/null
+++ b/manifests/server/debian/install.pp
@@ -0,0 +1,7 @@
+class nfs::server::debian::install {
+
+  package { 'nfs-kernel-server':
+    ensure => installed
+  }
+
+}
diff --git a/manifests/server/debian/service.pp b/manifests/server/debian/service.pp
new file mode 100644
index 0000000..ae69e74
--- /dev/null
+++ b/manifests/server/debian/service.pp
@@ -0,0 +1,22 @@
+class nfs::server::debian::service {
+
+  if $nfs::server::debian::nfs_v4 == true {
+      service {"nfs-kernel-server":
+        ensure     => running,
+        enable     => true,
+        hasrestart => true,
+        hasstatus  => true,
+        require    => Package["nfs-kernel-server"],
+        subscribe  => [ Concat['/etc/exports'], Augeas['/etc/idmapd.conf','/etc/default/nfs-common'] ],
+      }
+    } else {
+      service {"nfs-kernel-server":
+        ensure     => running,
+        enable     => true,
+        hasrestart => true,
+        hasstatus  => true,
+        require    => Package["nfs-kernel-server"],
+        subscribe  => Concat['/etc/exports'],
+     }
+  }
+}