diff --git a/database.c b/database.c
index 74de2c3..4083a9e 100644
--- a/database.c
+++ b/database.c
@@ -128,6 +128,7 @@ STATUS database_init(void)
 {
 	configuration *conf = get_modifiable_conf();
 	GError *error = NULL;
+	dbi_inst dbi_instance = 0;
 
 	conf->database_host = g_key_file_get_string(conf->keyfile, "database",
 												"host", &error);
@@ -167,8 +168,8 @@ STATUS database_init(void)
 	DEBUG(1, "Setting properties to %s database %s at %s as user %s", conf->database_driver, 
 		conf->database_name, conf->database_host, conf->database_username);
 
-	dbi_initialize(NULL);
-	conn = dbi_conn_new(conf->database_driver);
+	dbi_initialize_r(NULL, &dbi_instance);
+	conn = dbi_conn_new_r(conf->database_driver, &dbi_instance);
 	dbi_conn_set_option(conn, "host", conf->database_host);
 	dbi_conn_set_option(conn, "username", conf->database_username);
 	dbi_conn_set_option(conn, "password", conf->database_password);
diff --git a/spacestate.c b/spacestate.c
index 9154cb3..e33f2af 100644
--- a/spacestate.c
+++ b/spacestate.c
@@ -109,6 +109,7 @@ STATUS spacestate_init(void)
 	configuration *conf = get_modifiable_conf();
 	GError *error = NULL;
 	struct sigaction sa;
+	dbi_inst dbi_instance = 0;
 
 	/* Establish SIGCHLD handler. */
 	sigemptyset(&sa.sa_mask);
@@ -170,8 +171,8 @@ STATUS spacestate_init(void)
 	DEBUG(1, "Setting properties to %s space state database %s at %s as user %s", conf->spacestate_driver,
 		conf->spacestate_name, conf->spacestate_host, conf->spacestate_username);
 
-	dbi_initialize(NULL);
-	conn = dbi_conn_new(conf->spacestate_driver);
+	dbi_initialize_r(NULL, &dbi_instance);
+	conn = dbi_conn_new_r(conf->spacestate_driver, &dbi_instance);
 	dbi_conn_set_option(conn, "host", conf->spacestate_host);
 	dbi_conn_set_option(conn, "username", conf->spacestate_username);
 	dbi_conn_set_option(conn, "password", conf->spacestate_password);
@@ -180,4 +181,3 @@ STATUS spacestate_init(void)
 
 	return ST_OK;
 }
-