--- old.htaccess	2007-07-11 12:24:21.822442200 +0100
+++ .htaccess	2007-07-11 12:24:05.588171100 +0100
@@ -62,13 +62,14 @@
   #
   # If you want the site to be accessed WITH the www. only, adapt and
   # uncomment the following:
-  # RewriteCond %{HTTP_HOST} ^example\.com$ [NC]
-  # RewriteRule .* http://www.example.com/ [L,R=301]
+  # RewriteCond %{HTTP_HOST} ^(www\.)?(.*)$ [NC]
+  # RewriteCond %1 !^www [NC]
+  # RewriteRule ^(.*)$ http://www.%2/$1 [R=301,L]
   #
   # If you want the site to be accessed only WITHOUT the www. prefix, adapt
   # and uncomment the following:
-  # RewriteCond %{HTTP_HOST} ^www\.example\.com$ [NC]
-  # RewriteRule .* http://example.com/ [L,R=301]
+  # RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
+  # RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 
   # Modify the RewriteBase if you are using Drupal in a subdirectory and
   # the rewrite rules are not working properly.