diff -aurp open-iscsi-2.0-865.1/usr/idbm.c open-iscsi-2.0-865.1.work/usr/idbm.c
--- open-iscsi-2.0-865.1/usr/idbm.c	2007-06-21 13:17:40.000000000 -0500
+++ open-iscsi-2.0-865.1.work/usr/idbm.c	2007-06-21 13:20:27.000000000 -0500
@@ -2546,9 +2546,9 @@ idbm_init(char *configfile)
 	idbm_t *db;
 
 	/* make sure root db dir is there */
-	if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) {
-		if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) {
-			log_error("Could not make %s %d\n", ISCSI_CONFIG_ROOT,
+	if (access(ISCSIVAR, F_OK) != 0) {
+		if (mkdir(ISCSIVAR, 0660) != 0) {
+			log_error("Could not make %s %d\n", ISCSIVAR,
 				   errno);
 			return NULL;
 		}
diff -aurp open-iscsi-2.0-865.1/usr/idbm.h open-iscsi-2.0-865.1.work/usr/idbm.h
--- open-iscsi-2.0-865.1/usr/idbm.h	2007-06-21 13:18:31.000000000 -0500
+++ open-iscsi-2.0-865.1.work/usr/idbm.h	2007-06-21 13:18:41.000000000 -0500
@@ -26,12 +26,14 @@
 #include "initiator.h"
 #include "config.h"
 
-#define NODE_CONFIG_DIR		ISCSI_CONFIG_ROOT"nodes"
-#define IFACE_CONFIG_DIR	ISCSI_CONFIG_ROOT"ifaces"
-#define SLP_CONFIG_DIR		ISCSI_CONFIG_ROOT"slp"
-#define ISNS_CONFIG_DIR		ISCSI_CONFIG_ROOT"isns"
-#define STATIC_CONFIG_DIR	ISCSI_CONFIG_ROOT"static"
-#define ST_CONFIG_DIR		ISCSI_CONFIG_ROOT"send_targets"
+#define ISCSIVAR		"/var/lib/iscsi/"
+
+#define NODE_CONFIG_DIR		ISCSIVAR"nodes"
+#define IFACE_CONFIG_DIR	ISCSIVAR"ifaces"
+#define SLP_CONFIG_DIR		ISCSIVAR"slp"
+#define ISNS_CONFIG_DIR		ISCSIVAR"isns"
+#define STATIC_CONFIG_DIR	ISCSIVAR"static"
+#define ST_CONFIG_DIR		ISCSIVAR"send_targets"
 #define ST_CONFIG_NAME		"st_config"
 
 #define TYPE_INT	0