diff --git a/puppet/README.CentOS b/puppet/README.CentOS
new file mode 100644
index 0000000..40b64aa
--- /dev/null
+++ b/puppet/README.CentOS
@@ -0,0 +1,5 @@
+Installing the required gems on CentOS 6:
+
+yum install ruby ruby-devel rubygems sqlite sqlite-devel
+gem install --no-rdoc --no-ri rubygems-update && update_rubygems
+gem install --no-rdoc --no-ri mongrel rails sqlite3
diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index c7d20ad..fdf049c 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -203,6 +203,14 @@ class puppet::server::common inherits puppet::client {
 
     if $puppet_storeconfigs != "none" {
         case $operatingsystem {
+            "centos": {
+                if $operatingsystemrelease =~ /^[1-5]/ {
+                    package { [ "rubygem-rails",
+                                "rubygem-sqlite3-ruby", ]:
+                        ensure => installed,
+                    }
+                }
+            }
             "debian","ubuntu": {
                 package { [ "rails",
                             regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libsqlite3-ruby\1'), ]:
@@ -226,6 +234,10 @@ class puppet::server::common inherits puppet::client {
 
     package { "ruby-rrd":
         name   => $operatingsystem ? {
+            centos  => $operatingsystemrelease ? {
+                /^[1-5]/ => "ruby-RRDtool",
+                default  => "rrdtool-ruby",
+            },
             debian  => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'),
             ubuntu  => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'librrd-ruby\1'),
             openbsd => "ruby-rrd",
@@ -375,18 +387,27 @@ class puppet::server::mongrel {
         $puppet_listenports = [ "18140", "18141", "18142", "18143", ]
     }
 
-    include ::mongrel
     include ldap::client::ruby
 
     service { "puppetmaster":
         ensure    => running,
         enable    => true,
         hasstatus => true,
-        require   => Package["puppetmaster", "mongrel"],
         subscribe => File["/etc/puppet/fileserver.conf",
                           "/etc/puppet/puppet.conf"],
     }
 
+    if $operatingsystem == "CentOS" and $operatingsystemrelease !~ /^[1-5]/ {
+        Service["puppetmaster"] {
+            require => Package["puppetmaster"]
+        }
+    } else {
+        include ::mongrel
+        Service["puppetmaster"] {
+            require => Package["puppetmaster", "mongrel"]
+        }
+    }
+
     case $operatingsystem {
         debian,ubuntu: {
             file { "/etc/default/puppetmaster":