diff -Naur bacula-2.2.1/updatedb/update_mysql_tables_4_to_5 bacula-2.2.1.oden/updatedb/update_mysql_tables_4_to_5
--- bacula-2.2.1/updatedb/update_mysql_tables_4_to_5	2004-02-18 22:23:04.000000000 +0100
+++ bacula-2.2.1.oden/updatedb/update_mysql_tables_4_to_5	2007-09-03 15:29:04.000000000 +0200
@@ -37,7 +37,8 @@
 	    'Busy', 'Used') NOT NULL;
 ALTER TABLE Media CHANGE VolMaxBytes MaxVolBytes BIGINT UNSIGNED NOT NULL;
 
-UPDATE Version SET VersionId=5;
+DELETE FROM Version;
+INSERT INTO Version (VersionId) VALUES (5);
 
 END-OF-DATA
 then
diff -Naur bacula-2.2.1/updatedb/update_mysql_tables_5_to_6 bacula-2.2.1.oden/updatedb/update_mysql_tables_5_to_6
--- bacula-2.2.1/updatedb/update_mysql_tables_5_to_6	2004-02-18 22:23:04.000000000 +0100
+++ bacula-2.2.1.oden/updatedb/update_mysql_tables_5_to_6	2007-09-03 15:29:04.000000000 +0200
@@ -86,7 +86,8 @@
    PRIMARY KEY (Counter(128))
    );
 
-UPDATE Version SET VersionId=6;
+DELETE FROM Version;
+INSERT INTO Version (VersionId) VALUES (6);
 
 END-OF-DATA
 then
diff -Naur bacula-2.2.1/updatedb/update_mysql_tables_7_to_8 bacula-2.2.1.oden/updatedb/update_mysql_tables_7_to_8
--- bacula-2.2.1/updatedb/update_mysql_tables_7_to_8	2004-11-21 09:53:22.000000000 +0100
+++ bacula-2.2.1.oden/updatedb/update_mysql_tables_7_to_8	2007-09-03 15:29:04.000000000 +0200
@@ -9,7 +9,7 @@
 echo " "
 bindir=/usr/bin
 
-DB_VER="$bindir/mysql $* bacula -e 'select * from Version;'|tail -n 1 2>/dev/null"
+DB_VER="`$bindir/mysql $* bacula -e 'select * from Version;'|tail -n 1 2>/dev/null`"
 if [ -z "$DB_VER" ]; then
        echo "Sorry, I can't seem to locate a bacula database."
        exit 1
diff -Naur bacula-2.2.1/updatedb/update_sqlite_tables_4_to_5 bacula-2.2.1.oden/updatedb/update_sqlite_tables_4_to_5
--- bacula-2.2.1/updatedb/update_sqlite_tables_4_to_5	2004-02-18 22:23:04.000000000 +0100
+++ bacula-2.2.1.oden/updatedb/update_sqlite_tables_4_to_5	2007-09-03 15:29:04.000000000 +0200
@@ -9,9 +9,9 @@
 echo " "
 
 # The location of the sqlite program
-bindir=/usr/lib/sqlite
+bindir=/usr/bin
 # The location of your bacula working directory
-cd /var/bacula
+cd /var/lib/bacula
 
 if [ -s bacula.db ];then
 	DB_VER=`echo "select * from Version;" | $bindir/sqlite bacula.db | tail -n 1 2>/dev/null`
@@ -140,6 +140,7 @@
 DROP TABLE Pool_backup;
 COMMIT;
 
-UPDATE Version SET VersionId=5;
+DELETE FROM Version;
+INSERT INTO Version (VersionId) VALUES (5);
 
 END-OF-DATA
diff -Naur bacula-2.2.1/updatedb/update_sqlite_tables_5_to_6 bacula-2.2.1.oden/updatedb/update_sqlite_tables_5_to_6
--- bacula-2.2.1/updatedb/update_sqlite_tables_5_to_6	2004-02-18 22:23:04.000000000 +0100
+++ bacula-2.2.1.oden/updatedb/update_sqlite_tables_5_to_6	2007-09-03 15:29:04.000000000 +0200
@@ -9,9 +9,9 @@
 echo " "
 
 # The location of the sqlite program
-bindir=/usr/lib/sqlite
+bindir=/usr/bin
 # The location of your bacula working directory
-cd /var/bacula
+cd /var/lib/bacula
 
 if [ -s bacula.db ];then
 	DB_VER=`echo "select * from Version;" | $bindir/sqlite bacula.db | tail -n 1 2>/dev/null`
@@ -170,6 +170,7 @@
    PRIMARY KEY (Counter)
    );
 
-UPDATE Version SET VersionId=6;
+DELETE FROM Version;
+INSERT INTO Version (VersionId) VALUES (6);
 
 END-OF-DATA
diff -Naur bacula-2.2.1/updatedb/update_sqlite_tables_6_to_7 bacula-2.2.1.oden/updatedb/update_sqlite_tables_6_to_7
--- bacula-2.2.1/updatedb/update_sqlite_tables_6_to_7	2004-04-09 18:59:25.000000000 +0200
+++ bacula-2.2.1.oden/updatedb/update_sqlite_tables_6_to_7	2007-09-03 15:29:04.000000000 +0200
@@ -9,9 +9,9 @@
 echo " "
 
 # The location of the sqlite program
-bindir=/usr/lib/sqlite
+bindir=/usr/bin
 # The location of your bacula working directory
-cd /var/bacula
+cd /var/lib/bacula
 
 if [ -s bacula.db ];then
         DB_VER=`echo "select * from Version;" | $bindir/sqlite bacula.db | tail -n 1 2>/dev/null`
diff -Naur bacula-2.2.1/updatedb/update_sqlite_tables_8_to_9 bacula-2.2.1.oden/updatedb/update_sqlite_tables_8_to_9
--- bacula-2.2.1/updatedb/update_sqlite_tables_8_to_9	2005-11-06 19:04:07.000000000 +0100
+++ bacula-2.2.1.oden/updatedb/update_sqlite_tables_8_to_9	2007-09-03 15:29:04.000000000 +0200
@@ -9,7 +9,7 @@
 echo " "
 
 bindir=/usr/bin
-cd /var/bacula/working
+cd /var/lib/bacula
 sqlite=sqlite
 
 ${bindir}/${sqlite} $* bacula.db <<END-OF-DATA