diff --git a/manifests/portmap.pp b/manifests/portmap.pp
index e75487c215bb832147e7ea12f31f28888d4b429c..710abb2daf0f8c081b92b30f577c14d7f31ce848 100644
--- a/manifests/portmap.pp
+++ b/manifests/portmap.pp
@@ -9,45 +9,54 @@ class base::portmap {
 
   case $::operatingsystem {
     'redhat': {
-        include base::xinetd
+      include base::xinetd
 
-            case $::lsbdistcodename {
+      case $::lsbdistcodename {
 
-                'santiago': {
-                    package { 'rpcbind': ensure => present }
-                    service { 'rpcbind': ensure => running }
-                }
-                default: {
-                    package { 'portmap': ensure => present }
+        'santiago': {
+          package { 'rpcbind': ensure => present }
+          service { 'rpcbind': ensure => running }
+        }
+        default: {
+          package { 'portmap': ensure => present }
 
-                    # Ensure service is running.  Also notify xinetd in case the
-                    # services need to be re-registered with the portmap.
-                    service { 'portmap':
-                        ensure    => running,
-                        enable    => true,
-                        hasstatus => true,
-                        require   => Package['portmap'],
-                        restart   => '/etc/init.d/portmap restart',
-                        notify    => Service['xinetd'],
-                    }
-                }# rhel4/5
-            }
+          # Ensure service is running.  Also notify xinetd in case the
+          # services need to be re-registered with the portmap.
+          service { 'portmap':
+            ensure    => running,
+            enable    => true,
+            hasstatus => true,
+            require   => Package['portmap'],
+            restart   => '/etc/init.d/portmap restart',
+            notify    => Service['xinetd'],
+          }
+        }# rhel4/5
+      }
     }
     'debian': {
-        package { 'portmap': ensure => present }
-        service{ 'portmap':
+      case $::lsbdistcodename {
+
+        'squeeze': {
+          package { 'portmap': ensure => present }
+          service{ 'portmap':
             ensure    => running,
             enable    => true,
             hasstatus => false,
             status    => 'pidof portmap',
             require   => Package['portmap'],
             restart   => '/etc/init.d/portmap restart',
+          }
+        }
+        default: {
+          package { 'rpcbind': ensure => present }
+          service { 'rpcbind': ensure => running }
         }
+      }
     }
     # Ubuntu 11.10 switched to "rpcbind" like EL6
     'ubuntu': {
         package { 'rpcbind': ensure => present }
-        service { 'portmap': ensure => running }
+        service { 'rpcbind': ensure => running }
     }
   }
 }