--- setup-mysql.orig	2008-10-06 23:22:00.000000000 +0200
+++ setup-mysql	2009-01-12 15:38:18.000000000 +0100
@@ -158,7 +158,7 @@
 CONFIG_FILE=/etc/wordpress/config-$DOMAIN.php
 
 if [ ! $NAME ] ; then
-NAME=$(echo $DOMAIN | sed 's,\.,,g')
+NAME=$(echo $DOMAIN | sed 's,\.,,g;s,-,,g')
 echo Constructed database name and user: $NAME from $DOMAIN
 fi