diff --git a/manifests/site.pp b/manifests/site.pp
index 5667f23..5c2c03e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -69,6 +69,10 @@ define mailman::site ($default_email_host, $default_url_host)
     line    => "${default_email_host}: /srv/mailman/${name}",
   }
 
+  # We alias the resource name here so that it can resolve properly
+  # within the vhost template when evaluated as part of the vhost
+  # define (which will override $name).
+  $mailman_site_name = $name
   ::httpd::vhost { $default_url_host:
     port     => 80,
     docroot  => '/var/www/',
diff --git a/templates/mailman_multihost.vhost.erb b/templates/mailman_multihost.vhost.erb
index 7075bea..589ab81 100644
--- a/templates/mailman_multihost.vhost.erb
+++ b/templates/mailman_multihost.vhost.erb
@@ -34,7 +34,7 @@ Alias /images/mailman/ /usr/share/images/mailman/
     AllowOverride None
     Options ExecCGI
     AddHandler cgi-script .cgi
-    SetEnv MAILMAN_SITE_DIR /srv/mailman/<%= @name %>
+    SetEnv MAILMAN_SITE_DIR /srv/mailman/<%= @mailman_site_name %>
     Order allow,deny
     Allow from all
     <IfVersion >= 2.4>