diff --git a/deb/debian/mythtv-common.config b/deb/debian/mythtv-common.config
index 41b3753..02a365b 100644
--- a/deb/debian/mythtv-common.config
+++ b/deb/debian/mythtv-common.config
@@ -4,10 +4,18 @@
 
 CONFIG=/etc/mythtv/config.xml
 if [ -e $CONFIG ]; then
-    db_set mythtv/mysql_mythtv_dbname "`xpath  -q -e 'string(//DBName)' $CONFIG 2>/dev/null`"
-    db_set mythtv/mysql_mythtv_user "`xpath  -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`"
-    db_set mythtv/mysql_mythtv_password "`xpath  -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`"
-    db_set mythtv/mysql_host "`xpath  -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`"
+    if [ "`xpath  -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" = "" ]; then
+        db_set mythtv/mysql_mythtv_dbname "`xpath  -q -e 'string(//DatabaseName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_user "`xpath  -q -e 'string(//UserName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_password "`xpath  -q -e 'string(//Password)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_host "`xpath  -q -e 'string(//Host)' $CONFIG 2>/dev/null`"
+    else
+        ## This special case can be removed during the 14.10 dev cycle (it's only needed for upgrades from 0.25)
+        db_set mythtv/mysql_mythtv_dbname "`xpath  -q -e 'string(//DBName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_user "`xpath  -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_password "`xpath  -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_host "`xpath  -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`"
+    fi
 fi
 
 db_input low mythtv/mysql_mythtv_dbname   || true
diff --git a/deb/debian/mythtv-common.postinst b/deb/debian/mythtv-common.postinst
index e272feb..3f1a451 100644
--- a/deb/debian/mythtv-common.postinst
+++ b/deb/debian/mythtv-common.postinst
@@ -53,10 +53,10 @@ case "$1" in
 
     cat $INPUT > $NEW
 
-    perl -pi -e 's/(<DBHostName>).*?(<\/DBHostName>)/$1$ENV{'hostname'}$2/;' $NEW
-    perl -pi -e 's/(<DBUserName>).*?(<\/DBUserName>)/$1$ENV{'mythtv_username'}$2/;' $NEW
-    perl -pi -e 's/(<DBPassword>).*?(<\/DBPassword>)/$1$ENV{'mythtv_password'}$2/;' $NEW
-    perl -pi -e 's/(<DBName>).*?(<\/DBName>)/$1$ENV{'database'}$2/;' $NEW
+    perl -pi -e 's/(<Host>).*?(<\/Host>)/$1$ENV{'hostname'}$2/;' $NEW
+    perl -pi -e 's/(<UserName>).*?(<\/UserName>)/$1$ENV{'mythtv_username'}$2/;' $NEW
+    perl -pi -e 's/(<Password>).*?(<\/Password>)/$1$ENV{'mythtv_password'}$2/;' $NEW
+    perl -pi -e 's/(<DatabaseName>).*?(<\/DatabaseName>)/$1$ENV{'database'}$2/;' $NEW
     perl -pi -e 's/^\s+<LocalHostName>.*?<\/LocalHostName>\n//m;' $NEW
 
     mv $NEW /etc/mythtv/config.xml
diff --git a/deb/debian/mythtv-database.config b/deb/debian/mythtv-database.config
index 0a46a8f..1317c72 100755
--- a/deb/debian/mythtv-database.config
+++ b/deb/debian/mythtv-database.config
@@ -5,10 +5,18 @@
 
 CONFIG=/etc/mythtv/config.xml
 if [ -e $CONFIG ]; then
-    db_set mythtv/mysql_mythtv_dbname "`xpath  -q -e 'string(//DBName)' $CONFIG 2>/dev/null`"
-    db_set mythtv/mysql_mythtv_user "`xpath  -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`"
-    db_set mythtv/mysql_mythtv_password "`xpath  -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`"
-    db_set mythtv/mysql_host "`xpath  -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`"
+    if [ "`xpath  -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" = "" ]; then
+        db_set mythtv/mysql_mythtv_dbname "`xpath  -q -e 'string(//DatabaseName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_user "`xpath  -q -e 'string(//UserName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_password "`xpath  -q -e 'string(//Password)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_host "`xpath  -q -e 'string(//Host)' $CONFIG 2>/dev/null`"
+    else
+        ## This special case can be removed during the 14.10 dev cycle (it's only needed for upgrades from 0.25)
+        db_set mythtv/mysql_mythtv_dbname "`xpath  -q -e 'string(//DBName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_user "`xpath  -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_password "`xpath  -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_host "`xpath  -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`"
+    fi
 fi
 
 if which mysql >/dev/null; then
diff --git a/deb/debian/mythweb.config b/deb/debian/mythweb.config
index 0f1b607..803d5b3 100644
--- a/deb/debian/mythweb.config
+++ b/deb/debian/mythweb.config
@@ -3,10 +3,18 @@
 
 CONFIG=/etc/mythtv/config.xml
 if [ -e $CONFIG ]; then
-    db_set mythtv/mysql_mythtv_dbname "`xpath  -q -e 'string(//DBName)' $CONFIG 2>/dev/null`"
-    db_set mythtv/mysql_mythtv_user "`xpath  -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`"
-    db_set mythtv/mysql_mythtv_password "`xpath  -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`"
-    db_set mythtv/mysql_host "`xpath  -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`"
+    if [ "`xpath  -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" = "" ]; then
+        db_set mythtv/mysql_mythtv_dbname "`xpath  -q -e 'string(//DatabaseName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_user "`xpath  -q -e 'string(//UserName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_password "`xpath  -q -e 'string(//Password)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_host "`xpath  -q -e 'string(//Host)' $CONFIG 2>/dev/null`"
+    else
+        ## This special case can be removed during the 14.10 dev cycle (it's only needed for upgrades from 0.25)
+        db_set mythtv/mysql_mythtv_dbname "`xpath  -q -e 'string(//DBName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_user "`xpath  -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_mythtv_password "`xpath  -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`"
+        db_set mythtv/mysql_host "`xpath  -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`"
+    fi
 fi
 
 MYTHWEB_CONFIG=/etc/default/mythweb