diff --git a/.cvsignore b/.cvsignore
index b9bdeff..6d98627 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,4 @@ open-iscsi-5.0.5.595.tar.bz2
 open-iscsi-6.0.5.595.tar.bz2
 open-iscsi-1.1-645.tar.bz2
 open-iscsi-6.1.1.645.tar.bz2
+open-iscsi-6.1.1.685.tar.bz2
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 2e98666..f76a91f 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -1,8 +1,8 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
-Version: 6.1.1.645
-Release: 1
-Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
+Version: 6.1.1.685
+Release: 0
+Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-6.1.1.685.tar.bz2
 Source1: iscsi.init
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
 Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch
@@ -11,7 +11,7 @@ Group: System Environment/Daemons
 License: GPL
 URL: http://www.open-iscsi.org
 Buildroot: %{_tmppath}/%{name}-root
-BuildRequires: openssl-devel db4-devel
+BuildRequires: openssl-devel
 Prereq: /sbin/chkconfig
 ExcludeArch: s390 s390x
 
@@ -35,12 +35,12 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/var/db/iscsi/
+mkdir -p $RPM_BUILD_ROOT/etc/iscsi
 install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/sbin
 install -m 644 doc/iscsiadm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 644 doc/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 #install -m 755 etc/initd/initd.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
-install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc
+install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc/iscsi
 
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
 
@@ -48,8 +48,8 @@ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ ! -f /etc/initiatorname.iscsi ]; then
-	echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/initiatorname.iscsi
+if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then
+	echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi
 fi
 /sbin/chkconfig --add iscsi
 
@@ -62,12 +62,15 @@ fi
 %defattr(-,root,root)
 %doc README
 %config /etc/rc.d/init.d/iscsi
-%attr(0600,root,root) %config(noreplace) /etc/iscsid.conf
-%dir /var/db/iscsi
+%attr(0600,root,root) %config(noreplace) /etc/iscsi/iscsid.conf
 /sbin/*
 %{_mandir}/*/*
 
 %changelog
+* Mon Aug 28 2006 Mike Christie <mchristie@redhat.com> - 6.1.1.685
+- Rebase to upstream to bring in many bug fixes and rm db.
+- iscsi uses /etc/iscsi instead of just etc now
+
 * Fri Jul 21 2006 Jeremy Katz <katzj@redhat.com> - 6.1.1.645-1
 - fix shutdown with root on iscsi
 
diff --git a/iscsi.init b/iscsi.init
index bd78918..64feae3 100755
--- a/iscsi.init
+++ b/iscsi.init
@@ -4,8 +4,8 @@
 # description: Starts and stops the iSCSI initiator
 #
 # processname: iscsid
-# pidfile: /var/run/iscsid.pid
-# config:  /etc/iscsid.conf
+# pidfile: /etc/iscsi/iscsid.pid
+# config:  /etc/iscsi/iscsid.conf
 
 # Source function library.
 . /etc/init.d/functions
@@ -26,11 +26,13 @@ start()
 	touch /var/lock/subsys/iscsi
 
 	echo -n $"Setting up iSCSI targets: "
-	TARGETS=`iscsiadm -m node 2> /dev/null | sed 's@\[\(.*\)\] .*@\1@g'`
-	for rec in $TARGETS; do
-		STARTUP=`iscsiadm -m node -r $rec | grep "node.startup" | cut -d' ' -f3`
-		if [ $STARTUP = "automatic" ]; then
-			iscsiadm -m node -r $rec -l
+	TARGETS=`iscsiadm -m node 2>/dev/null | sed 's/ /@/g'`
+	for node in $TARGETS; do
+		target=`echo $node | cut -d@ -f2`
+		port=`echo $node | cut -d@ -f1`
+		STARTUP=`iscsiadm -m node -T $target -p $port | grep "node.conn\[0\].startup" | cut -d' ' -f3`
+		if [ "$STARTUP" = "automatic" ]; then
+			iscsiadm -m node -T $target -p $port -l
 		fi
 	done
 	success
diff --git a/sources b/sources
index 5b9ad3c..e657394 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46938978c78168de917f73f9e53c9425  open-iscsi-6.1.1.645.tar.bz2
+89a822f2b1a06884f915e6512df3a384  open-iscsi-6.1.1.685.tar.bz2