diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index ab31897..08647c2 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -127,7 +127,11 @@ class puppet::server inherits puppet::client {
         }
     }
 
-    package { "puppet-server":
+    package { "puppetmaster":
+        name   => $operatingsystem ? {
+            ubuntu  => "puppetmaster",
+            default => "puppet-server",
+        },
         ensure => installed,
     }
 
@@ -139,11 +143,11 @@ class puppet::server inherits puppet::client {
     }
 
     include mongrel
+    include ldap::client::ruby
 
     package { [ "rubygem-rails",
                 "rubygem-sqlite3-ruby",
-                "ruby-RRDtool",
-                "ruby-ldap", ]:
+                "ruby-RRDtool", ]:
         ensure => installed,
     }
 
@@ -175,7 +179,7 @@ class puppet::server inherits puppet::client {
             owner   => puppet,
             group   => puppet,
             require => [ File["/srv/puppet"],
-                         Package["puppet-server"], ],
+                         Package["puppetmaster"], ],
             before  => Service["puppetmaster"],
         }
     }
@@ -187,7 +191,7 @@ class puppet::server inherits puppet::client {
         owner   => puppet,
         group   => puppet,
         require => [ File["/srv/puppet"],
-                     Package["puppet-server"], ],
+                     Package["puppetmaster"], ],
         before  => Service["puppetmaster"],
     }
     file { "/srv/puppet/files":
@@ -212,7 +216,7 @@ class puppet::server inherits puppet::client {
         owner   => root,
         group   => puppet,
         require => [ File["/srv/puppet/files"],
-                     Package["puppet-server"], ],
+                     Package["puppetmaster"], ],
         before  => Service["puppetmaster"],
     }
 
@@ -220,7 +224,7 @@ class puppet::server inherits puppet::client {
         ensure    => running,
         enable    => true,
         hasstatus => true,
-        require   => Package["puppet-server"],
+        require   => Package["puppetmaster"],
         subscribe => File["/etc/puppet/puppet.conf"],
     }
 
@@ -236,7 +240,7 @@ class puppet::server inherits puppet::client {
         mode    => 0644,
         owner   => root,
         group   => root,
-        require => Package["puppet-server"],
+        require => Package["puppetmaster"],
     }
 
     file { "/etc/puppet/fileserver.conf":
@@ -247,17 +251,21 @@ class puppet::server inherits puppet::client {
         mode    => 0644,
         owner   => root,
         group   => root,
-        require => Package["puppet-server"],
+        require => Package["puppetmaster"],
         notify  => Service["puppetmaster"],
     }
     
-    file { "/etc/sysconfig/puppetmaster":
-        ensure  => present,
-        content => template("puppet/puppetmaster.sysconfig.erb"),
-        mode    => 0644,
-        owner   => root,
-        group   => root,
-        notify  => Service["puppetmaster"],
+    case $operatingsystem {
+        fedora,centos: {
+            file { "/etc/sysconfig/puppetmaster":
+                ensure  => present,
+                content => template("puppet/puppetmaster.sysconfig.erb"),
+                mode    => 0644,
+                owner   => root,
+                group   => root,
+                notify  => Service["puppetmaster"],
+            }
+        }
     }
 
     if !$puppet_report_maxage {