diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 4ffc400..8ed373b 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -133,7 +133,12 @@ class puppet::manual inherits puppet::client {
 }
 
 
-# Install and configure Puppet server
+class puppet::server {
+    fail("puppet::server class is deprecated, use puppet::server::mongrel or puppet::server::apache instead")
+}
+
+
+# Install and configure Puppet server using mongrel.
 #
 # === Global variables
 #
@@ -148,7 +153,7 @@ class puppet::manual inherits puppet::client {
 #   $puppet_report_maxage:
 #       Maximum age (in hours) to keep reports. Defaults to 720 hours (30 days).
 #
-class puppet::server inherits puppet::client {
+class puppet::server::mongrel inherits puppet::client {
 
     if ! $puppet_listenports {
         $puppet_listenports = [ "18140", "18141", "18142", "18143", ]
@@ -183,21 +188,6 @@ class puppet::server inherits puppet::client {
         before      => File["/etc/puppet/puppet.conf"],
     }
 
-    include apache::sslserver
-    apache::configfile { "puppet.conf":
-        content => template("puppet/puppet-httpd.conf.erb"),
-        http    => false,
-        require => Service["puppetmaster"],
-    }
-    case $operatingsystem {
-        debian,ubuntu: {
-            include apache::mod::headers
-            include apache::mod::proxy
-            include apache::mod::proxy_http
-            include apache::mod::proxy_balancer
-        }
-    }
-
     include mongrel
     include ldap::client::ruby
 
@@ -361,6 +351,28 @@ class puppet::server inherits puppet::client {
 }
 
 
+# Install and configure Puppet server using apache as proxy server.
+#
+class puppet::server::apache inherits puppet::server::mongrel {
+
+    include apache::sslserver
+    apache::configfile { "puppet.conf":
+        content => template("puppet/puppet-httpd.conf.erb"),
+        http    => false,
+        require => Service["puppetmaster"],
+    }
+    case $operatingsystem {
+        debian,ubuntu: {
+            include apache::mod::headers
+            include apache::mod::proxy
+            include apache::mod::proxy_http
+            include apache::mod::proxy_balancer
+        }
+    }
+
+}
+
+
 # Install and configure opencollab-puppet-uploader.
 #
 # === Global variables