diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index ff23513482..5b7f80b7e2 100644
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -274,10 +274,10 @@ main( int argc, char **argv )
 		}
 	}
 
-	slap_shutdown(dbnum);
-
 	wait4kids( -1 );
 
+	slap_shutdown(dbnum);
+
 	slap_destroy();
 
 	return( 0 );
@@ -315,8 +315,12 @@ fork_child( char *prog, char *args[] )
         perror( "CreateProcess" );
         exit (-1);
     }
+#ifndef IMDARING
+    WaitForSingleObject( proc_info.hProcess, INFINITE );
+#else
     processes[nprocesses] = proc_info.hProcess;
     nprocesses++;
+#endif
 }
 
 static void