2 files changed, 17 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index ec58747f4..ebcbe22fd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -174,28 +174,35 @@ void save_databases(void)
         if (!skeleton) {
             waiting = -11;
             save_ns_rdb_dbase();
+            anope_cmd_pong(ServerName, ServerName);
             waiting = -12;
             save_cs_rdb_dbase();
+            anope_cmd_pong(ServerName, ServerName);
             if (PreNickDBName) {
                 save_ns_req_rdb_dbase();
+                anope_cmd_pong(ServerName, ServerName);
                 waiting = -13;
             }
-            /* Temporary fix to avoid unwanted timeouts... */
-            anope_cmd_pong(ServerName, ServerName);
             if (s_BotServ) {
                 waiting = -14;
                 save_bs_rdb_dbase();
+                anope_cmd_pong(ServerName, ServerName);
             }
             if (s_HostServ) {
                 waiting = -15;
                 save_hs_rdb_dbase();
+                anope_cmd_pong(ServerName, ServerName);
             }
             waiting = -16;
             save_os_rdb_dbase();
+            anope_cmd_pong(ServerName, ServerName);
             waiting = -17;
             save_rdb_news();
+            anope_cmd_pong(ServerName, ServerName);
             waiting = -18;
             save_rdb_exceptions();
+            anope_cmd_pong(ServerName, ServerName);
+
         }
     }
 #endif
diff --git a/src/rdb.c b/src/rdb.c
index 90afd18da..40df00d9b 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -418,33 +418,41 @@ void rdb_load_dbases(void)
 {
     if (!skeleton) {
         rdb_load_ns_dbase();
+        anope_cmd_pong(ServerName, ServerName);
         if (debug)
             alog("RDB: Loaded NickServ DataBase (1/8)");
         if (s_HostServ) {
             rdb_load_hs_dbase();
+            anope_cmd_pong(ServerName, ServerName);
             if (debug)
                 alog("RDB: Loaded HostServ DataBase (2/8)");
         }
         if (s_BotServ) {
             rdb_load_bs_dbase();
+            anope_cmd_pong(ServerName, ServerName);
             if (debug)
                 alog("RDB: Loaded BotServ DataBase (3/8)");
         }
         rdb_load_cs_dbase();
+        anope_cmd_pong(ServerName, ServerName);
         if (debug)
             alog("RDB: Loaded ChanServ DataBase (4/8)");
     }
     rdb_load_os_dbase();
+    anope_cmd_pong(ServerName, ServerName);
     if (debug)
         alog("RDB: Loaded OperServ DataBase (5/8)");
     rdb_load_news();
+    anope_cmd_pong(ServerName, ServerName);
     if (debug)
         alog("RDB: Loaded News DataBase (6/8)");
     rdb_load_exceptions();
+    anope_cmd_pong(ServerName, ServerName);
     if (debug)
         alog("RDB: Loaded Exception Database (7/8)");
     if (PreNickDBName) {
         rdb_load_ns_req_dbase();
+        anope_cmd_pong(ServerName, ServerName);
         if (debug)
             alog("RDB: Loaded PreNick DataBase (8/8)");
     } else {