diff --git a/munin/manifests/init.pp b/munin/manifests/init.pp
index fc49631..9187618 100644
--- a/munin/manifests/init.pp
+++ b/munin/manifests/init.pp
@@ -215,7 +215,7 @@ define munin::plugin($config = "") {
 #
 class munin::server {
 
-    package { "munin":
+    package { [ "munin", "munin-cgi" ] :
         ensure => installed,
     }
 
@@ -289,13 +289,31 @@ class munin::server {
                      "puppet:///modules/munin/munin-htaccess", ],
         require => Package["munin"],
     }
+
+    file { "/var/www/html/munin/cgi":
+        ensure  => directory,
+        mode    => "0755",
+        owner   => "root",
+        group   => "root",
+        require => Package["munin"],
+    }
     file { "/var/www/html/munin/cgi/.htaccess":
         ensure  => present,
         mode    => "0644",
         owner   => "root",
         group   => "root",
         source  => "puppet:///modules/munin/cgi-htaccess",
-        require => Package["munin"],
+        require => File["/var/www/html/munin/cgi"],
+    }
+    file { "/var/www/html/munin/cgi/munin-cgi-graph":
+        ensure  => link,
+        target  => "/var/www/cgi-bin/munin-cgi-graph",
+        require => File["/var/www/html/munin/cgi"],
+    }
+    file { "/var/www/html/munin/cgi/munin-cgi-html":
+        ensure  => link,
+        target  => "/var/www/cgi-bin/munin-cgi-html",
+        require => File["/var/www/html/munin/cgi"],
     }
 
     file { "/etc/munin/conf.d":