diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 31e0a0610c99b46e2a24e7c0987b3c59d632de05..ffe8ac02e5f492a3098dffef36822bf5eb05951c 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -423,6 +423,19 @@ class apache2_plugin {
 			$rewrite_rules[] = array(	'rewrite_domain' 	=> $data["new"]["domain"],
 										'rewrite_type' 		=> $data["new"]["redirect_type"],
 										'rewrite_target' 	=> $data["new"]["redirect_path"]);
+            
+            switch($data["new"]["subdomain"]) {
+            case 'www':
+    			$rewrite_rules[] = array(	'rewrite_domain' 	=> 'www.'.$data["new"]["domain"],
+    										'rewrite_type' 		=> $data["new"]["redirect_type"],
+    										'rewrite_target' 	=> $data["new"]["redirect_path"]);
+                break;
+            case '*':
+    			$rewrite_rules[] = array(	'rewrite_domain' 	=> '*'.$data["new"]["domain"],
+    										'rewrite_type' 		=> $data["new"]["redirect_type"],
+    										'rewrite_target' 	=> $data["new"]["redirect_path"]);
+                break;
+            }
 		}
 		
 		// get alias domains (co-domains and subdomains)
@@ -454,6 +467,18 @@ class apache2_plugin {
 					$rewrite_rules[] = array(	'rewrite_domain' 	=> $alias["domain"],
 												'rewrite_type' 		=> $alias["redirect_type"],
 												'rewrite_target' 	=> $alias["redirect_path"]);
+                    switch($alias["subdomain"]) {
+                    case 'www':
+            			$rewrite_rules[] = array(	'rewrite_domain' 	=> 'www.'.$alias["domain"],
+            										'rewrite_type' 		=> $alias["redirect_type"],
+            										'rewrite_target' 	=> $alias["redirect_path"]);
+                        break;
+                    case '*':
+            			$rewrite_rules[] = array(	'rewrite_domain' 	=> '*'.$alias["domain"],
+            										'rewrite_type' 		=> $alias["redirect_type"],
+            										'rewrite_target' 	=> $alias["redirect_path"]);
+                        break;
+                    }
 				}
 			}
 		}