diff --git a/roles/mail/templates/nginx/vhost.j2 b/roles/mail/templates/nginx/vhost.j2
index 0fb6773..a4bbcb9 100644
--- a/roles/mail/templates/nginx/vhost.j2
+++ b/roles/mail/templates/nginx/vhost.j2
@@ -15,20 +15,12 @@ server {
 	}
 
 	location = / {
-		rewrite ^ /mailman/listinfo permanent;
+		rewrite ^ /listinfo permanent;
 	}
 
 	location / {
-		rewrite ^ /mailman$uri?$args;
-	}
-
-	location = /mailman/ {
-		rewrite ^ /mailman/listinfo permanent;
-	}
-
-	location /mailman {
-		root /usr/lib/cgi-bin;
-		fastcgi_split_path_info (^/mailman/[^/]+)(/.*)$;
+		root /usr/lib/cgi-bin/mailman;
+		fastcgi_split_path_info (^/[^/]*)(.*)$;
 		fastcgi_pass unix:///var/run/fcgiwrap.socket;
 		include /etc/nginx/fastcgi_params;
 		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;