diff --git a/manifests/params.pp b/manifests/params.pp
index 69c1873..05a072e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -89,6 +89,8 @@
     agent_service      => 'puppet',
     agent_service_conf => '/etc/default/puppet',
     default_method     => 'cron',
+    server_package     => 'puppetserver',
+    server_service     => 'puppetserver',
     master_package     => 'puppetmaster',
     master_service     => 'puppetmaster',
     puppet_cmd         => '/usr/bin/puppet',
diff --git a/manifests/server.pp b/manifests/server.pp
index b98ba57..7c3b1df 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -64,7 +64,11 @@
   include puppet::server::config
 
   if $manage_package and ($puppet::agent::package != $package) {
-    package { $package:
+    $package_real = $servertype ? {
+      'server' => $puppet::params::server_package,
+      default  => $package,
+    }
+    package { $package_real:
       ensure => $ensure;
     }
   }
@@ -103,8 +107,11 @@
     'standalone': {
       include puppet::server::standalone
     }
+    'server': {
+      include puppet::server::server
+    }
     default: {
-      err('Only "passenger", "thin", and "unicorn" are valid options for servertype')
+      err('Only "passenger", "thin", "serverr", and "unicorn" are valid options for servertype')
       fail('Servertype "$servertype" not implemented')
     }
   }
diff --git a/manifests/server/server.pp b/manifests/server/server.pp
new file mode 100644
index 0000000..0f0e383
--- /dev/null
+++ b/manifests/server/server.pp
@@ -0,0 +1,11 @@
+class puppet::server::server {
+  class { 'puppet::server::standalone': enabled => false }
+
+  # configure
+  # lol, no idea, really :(
+
+  service { $puppet::params::server_service:
+    ensure => $puppet::server::ensure
+  }
+
+}