diff --git a/TODO b/TODO
index b61aad703..566dbf55d 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
 TODO list
+  - server/client-side: upload/download make.conf and package.* from portage
   - add i18n support
   - server-side: improve RDEPEND check output
   - server-side: add libtest to reagent
diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py
index d5f50e4bd..bb40f3039 100644
--- a/libraries/databaseTools.py
+++ b/libraries/databaseTools.py
@@ -3234,6 +3234,9 @@ class etpDatabase:
             elif name.startswith("sqlite_"):
                 continue
             else:
+                t_cmd = "CREATE TABLE"
+                if sql.startswith(t_cmd):
+                    sql = "CREATE TABLE IF NOT EXISTS"+sql[len(t_cmd):]
                 dumpfile.write("%s;\n" % sql)
 
             self.cursor.execute("PRAGMA table_info('%s')" % name)
diff --git a/libraries/entropy.py b/libraries/entropy.py
index 7004191aa..338b0455e 100644
--- a/libraries/entropy.py
+++ b/libraries/entropy.py
@@ -5831,6 +5831,8 @@ class RepoInterface:
                 if os.path.isfile(dbfile):
                     os.remove(dbfile)
                 dbconn = self.Entropy.openGenericDatabase(dbfile, xcache = False, indexing_override = False)
+                #dbconn.initializeDatabase()
+                #dbconn.createAllIndexes()
                 rc = dbconn.doDatabaseImport(dumpfile, dbfile)
                 dbconn.closeDB()
                 del dbconn