diff --git a/README b/README
index 48e57eeb7..46f2737fe 100644
--- a/README
+++ b/README
@@ -31,24 +31,12 @@ For more information about each subproject see their README files.
 QLogic target driver
 ====================
 
-QLogic target driver qla2x00t is the old driver, forked from qla2xxx
+The QLogic target driver qla2x00t is the old driver, forked from qla2xxx
 several years ago. It is very stable, well tested and actively used in
 many production setups.
 
-There is also new driver, maintained by QLogic, which, among other,
-supports 32G FC, see http://scst.sourceforge.net/target_qla2x00t.html.
-You can find the latest version of it in git://git.qlogic.com/scst-qla2xxx.git.
-
-To integrate it into the SCST build tree you need to clone the QLogic
-git tree in a subdirectory of this directory (SCST root tree) with name
-qla2x00t_git (or create a symlink with this name pointing to any other
-location in your system).
-
-Now common and QLA specific root Makefile targets "magically" start
-working with the new driver. Then follow instructions in the git's
-README.
-
-In presence of qla2x00t_git subdirectory you can still build the
-qla2x00t using qla_old* root Makefile targets.
+There is also a new driver that supports 32 Gb/s FC in the qla2x00t-32gbit
+directory. That driver has not yet reached the same maturity level as the
+old qla2x00t driver.
 
 Vladislav Bolkhovitin <vst@vlnb.net>, http://scst.sourceforge.net
diff --git a/iscsi-scst/usr/conn.c b/iscsi-scst/usr/conn.c
index e5531dcf3..ba61af5ad 100644
--- a/iscsi-scst/usr/conn.c
+++ b/iscsi-scst/usr/conn.c
@@ -56,6 +56,8 @@ void conn_free(struct connection *conn)
 	free(conn->initiator);
 	free(conn->target_portal);
 	free(conn->user);
+	if (conn->auth_method == AUTH_CHAP)
+		free(conn->auth.chap.challenge);
 	free(conn);
 	return;
 }
diff --git a/qla2x00t/doc/qla2x00t-howto.html b/qla2x00t/doc/qla2x00t-howto.html
index 540f21f11..5f8e8a26e 100644
--- a/qla2x00t/doc/qla2x00t-howto.html
+++ b/qla2x00t/doc/qla2x00t-howto.html
@@ -112,11 +112,10 @@ And on SUSE systems these packages can be installed by running the following com
 </li>
 
 <li>
-  If you want to use the latest QLogic SCST target driver from the QLogic git, download it by:
-  <pre>[root@proj ]# git clone git://git.qlogic.com/scst-qla2xxx.git
-[root@proj ]# cd scst
-[root@proj scst]# ln -s ../scst-qla2xxx/drivers/scsi/qla2xxx qla2x00t_git</pre>
-  Note, this driver is not stable at the moment, therefore use of the driver from the SCST tree is recommended.
+  If you want to use the latest QLogic SCST target driver from the QLogic git,
+  use the driver from the qla2x00t-32gbit directory. Please note that this
+  driver has not yet reached the same maturity level as the driver in the
+  qla2x00t directory.
 </li>
 
 <li id="blacklist">