diff --git a/changelog b/changelog
index e0424065ac5f89f09c76db0eaf7755885c416f2b..3399011c6e1a126a8543686b97ed414d4417630c 100644
--- a/changelog
+++ b/changelog
@@ -20,7 +20,9 @@ version 0.x -- xxxxxxxxxxxxx
 	added configfile option to mysql handler
 		the default is /etc/mysql/debian.cnf. with this, 
 		sqldump doesn't need dbusername. (hotcopy still does).
-
+    fixed bug in mysql handler which caused some passwords to not work.
+        (.my.cnf files now have double quotes around password)
+    
 version 0.5 -- April 12 2005
 	rdiff handler works when remote sshd has a banner
 	rdiff handler supports local dest 
diff --git a/handlers/mysql b/handlers/mysql
index 13dd62f2643a9d3be9ffdcaf0e82df2555d8cdc0..a4a1497d35195acce702b887d0a1b4c266d855ba 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -96,15 +96,15 @@ if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
 # auto generated backupninja mysql conf
 [mysql]
 user=$dbusername
-password=$dbpassword
+password="$dbpassword"
 
 [mysqldump]
 user=$dbusername
-password=$dbpassword
+password="$dbpassword"
 
 [mysqlhotcopy]
 user=$dbusername
-password=$dbpassword
+password="$dbpassword"
 EOF
 	umask $oldmask
 	defaultsfile="--defaults-file=$mycnf"