diff --git a/Makefile b/Makefile
index c85d9f619..68f2964f9 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,10 @@ endif
 SCST_DIR=scst
 DOC_DIR=doc
 SCSTADM_DIR=scstadmin
-QLA_INI_DIR=qla2x00t
-QLA_DIR=qla2x00t/qla2x00-target
-QLA_ISP_DIR=qla_isp
+QLA_INI_DIR=qla2x00t_git
+QLA_DIR=qla2x00t_git/qla2x00-target
+QLA_OLD_INI_DIR=qla2x00t
+QLA_OLD_DIR=qla2x00t/qla2x00-target
 LSI_DIR=mpt
 USR_DIR=usr/fileio
 SRP_DIR=srpt
@@ -75,16 +76,17 @@ help:
 	@echo "		scstadm_uninstall : scstadmin: uninstall"
 	@echo ""
 	@echo "		qla               : make QLA target driver"
-	@echo "		qla_clean         : 2.6 qla target: clean "
-	@echo "		qla_extraclean    : 2.6 qla target: clean + clean dependencies"
-	@echo "		qla_install       : 2.6 qla target: install"
-	@echo "		qla_uninstall     : 2.6 qla target: uninstall"
+	@echo "		qla_pull          : pull the latest version of the QLA target driver from the QLogic's git"
+	@echo "		qla_clean         : qla target: clean "
+	@echo "		qla_extraclean    : qla target: clean + clean dependencies"
+	@echo "		qla_install       : qla target: install"
+	@echo "		qla_uninstall     : qla target: uninstall"
 	@echo ""
-	@echo "		qla_isp           : make ISP Qlogic chipsets target driver"
-	@echo "		qla_isp_clean     : qla ISP target: clean "
-	@echo "		qla_isp_extraclean: qla ISP target: clean + clean dependencies"
-	@echo "		qla_isp_install   : qla ISP target: install"
-	@echo "		qla_isp_uninstall : qla ISP target: uninstall"
+	@echo "		qla_old           : make old Qlogic chipsets target driver"
+	@echo "		qla_old_clean     : qla old target: clean "
+	@echo "		qla_old_extraclean: qla old target: clean + clean dependencies"
+	@echo "		qla_old_install   : qla old target: install"
+	@echo "		qla_old_uninstall : qla old target: uninstall"
 	@echo ""
 	@echo "		iscsi             : make iSCSI target"
 	@echo "		iscsi_clean       : ISCSI target: clean "
@@ -140,7 +142,7 @@ all:
 	cd $(SCST_DIR) && $(MAKE) $@
 #	@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-#	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
+#	@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -151,7 +153,7 @@ install:
 	cd $(SCST_DIR) && $(MAKE) $@
 #	@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-#	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
+#	@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -162,7 +164,7 @@ uninstall:
 	cd $(SCST_DIR) && $(MAKE) $@
 #	@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-#	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
+#	@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -174,7 +176,8 @@ clean:
 	@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
 	@if [ -d $(QLA_INI_DIR) ]; then cd $(QLA_INI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-#	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
+	@if [ -d $(QLA_OLD_INI_DIR) ]; then cd $(QLA_OLD_INI_DIR) && $(MAKE) $@; fi
+	@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -187,7 +190,8 @@ extraclean:
 	@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
 	@if [ -d $(QLA_INI_DIR) ]; then cd $(QLA_INI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-#	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
+	@if [ -d $(QLA_OLD_INI_DIR) ]; then cd $(QLA_OLD_INI_DIR) && $(MAKE) $@; fi
+	@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -239,6 +243,9 @@ scstadm_extraclean:
 qla:
 	cd $(QLA_DIR) && $(MAKE) all
 
+qla_pull:
+	cd $(QLA_INI_DIR) && git pull
+
 qla_install:
 	cd $(QLA_DIR) && $(MAKE) install
 
@@ -253,20 +260,20 @@ qla_extraclean:
 	cd $(QLA_INI_DIR)/.. && $(MAKE) extraclean
 	cd $(QLA_DIR) && $(MAKE) extraclean
 
-qla_isp:
-	cd $(QLA_ISP_DIR) && $(MAKE) all
+qla_old:
+	cd $(QLA_OLD_DIR) && $(MAKE) all
 
-qla_isp_install:
-	cd $(QLA_ISP_DIR) && $(MAKE) install
+qla_old_install:
+	cd $(QLA_OLD_DIR) && $(MAKE) install
 
-qla_isp_uninstall:
-	cd $(QLA_ISP_DIR) && $(MAKE) uninstall
+qla_old_uninstall:
+	cd $(QLA_OLD_DIR) && $(MAKE) uninstall
 
-qla_isp_clean:
-	cd $(QLA_ISP_DIR) && $(MAKE) clean
+qla_old_clean:
+	cd $(QLA_OLD_DIR) && $(MAKE) clean
 
-qla_isp_extraclean:
-	cd $(QLA_ISP_DIR) && $(MAKE) extraclean
+qla_old_extraclean:
+	cd $(QLA_OLD_DIR) && $(MAKE) extraclean
 
 iscsi:
 	cd $(ISCSI_DIR) && $(MAKE) all
@@ -411,7 +418,7 @@ rpm:
 2perf: extraclean
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-#	patch -p0 <qla_isp-release.patch
+	@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -422,7 +429,7 @@ rpm:
 2release: extraclean
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-#	patch -p0 <qla_isp-release.patch
+	@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -433,7 +440,7 @@ rpm:
 2debug: extraclean
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-#	patch -p0 -R <qla_isp-release.patch
+	@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -444,7 +451,7 @@ rpm:
 enable_proc: extraclean
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-#	patch -p0 -R <qla_isp-release.patch
+	@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -454,7 +461,7 @@ enable_proc: extraclean
 disable_proc: extraclean
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-#	patch -p0 -R <qla_isp-release.patch
+	@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -463,7 +470,7 @@ disable_proc: extraclean
 
 .PHONY: all install uninstall clean extraclean tags help \
 	qla qla_install qla_uninstall qla_clean qla_extraclean \
-	qla_isp qla_isp_install qla_isp_uninstall qla_isp_clean qla_isp_extraclean \
+	qla_old qla_old_install qla_old_uninstall qla_old_clean qla_old_extraclean \
 	lsi lsi_install lsi_uninstall lsi_clean lsi_extraclean \
 	iscsi iscsi_install iscsi_uninstall iscsi_clean iscsi_extraclean \
 	scst scst_install scst_uninstall scst_clean scst_extraclean \
diff --git a/README b/README
index 4a3b41e27..e42fd5e92 100644
--- a/README
+++ b/README
@@ -1,3 +1,6 @@
+Overview
+========
+
 This is the SCST development repository. It contains not a single
 project SCST as one can think, but a number of them, which are divided
 as the following:
@@ -24,4 +27,34 @@ make scst scst_install iscsi iscsi_install
 
 For more information about each subproject see their README files.
 
+
+QLogic target driver
+====================
+
+QLogic target driver in qla2x00t/ is the old one, forked from qla2xxx
+from kernel 2.6.26. It is not maintained anymore and not built by
+default by the common Makefile targets, like "all".
+
+You can find the latest version of this driver in git://git.qlogic.com/scst-qla2xxx.git.
+It is now maintained by QLogic, hence located in the QLogic's git.
+
+To integrate it into the SCST build tree you need:
+
+1. Clone the QLogic git tree somewhere in your system.
+
+2. Create in the SCST root, i.e. this directory, a subdirectory with name
+qla2x00t_git
+
+3. Bind mount drivers/scsi/qla2xxx in the cloned git tree to the
+qla2x00t_git subdirectory, like:
+
+# mount --bind /home/u/scst-qla2xxx/drivers/scsi/qla2xxx /home/u/trunk/qla2x00t_git
+
+Thats all. Now "make all" and other common and QLA specific root
+Makefile targets "magically" start working. The bind mount is necessary
+for the driver to correctly find the SCST header files. Symlinks can't
+do it.
+
+You can still build the old driver using qla_old* root Makefile targets.
+
 Vladislav Bolkhovitin <vst@vlnb.net>, http://scst.sourceforge.net
diff --git a/www/target_qla2x00t.html b/www/target_qla2x00t.html
index b4dd81ba8..524ee5e87 100644
--- a/www/target_qla2x00t.html
+++ b/www/target_qla2x00t.html
@@ -58,17 +58,20 @@
 	  		<div id="main"> 
 				<h1>Target driver qla2x00t for QLogic FC adapters</h1>
 				<p><img src="images/t_qlogic.gif" width="100" height="120" class="float-left" alt="SCST QLogic">
-				This is target driver for QLogic qla2xxx (22xx/23xx/24xx/25xx) Fibre Channel adapters. It is stable and well tested.</p>
+				This is target driver for QLogic qla2xxx (22xx++) Fibre Channel adapters.</p>
 
-				<p>The latest stable version is 2.2.0. Requires Linux kernel version 2.6.26.x or higher and
-				SCST version 2.2.0 or higher.</p>
+				<p>The latest stable version is 3.0.0. Requires Linux kernel version 2.6.26.x or higher and
+				SCST version 3.0.0 or higher.</p>
 
-				<p>Driver for the latest QLogic 16Gb/10G FC/FCoE adapters you can find in git.qlogic.com/scst.git</p>
+				<p>Driver in qla2x00t subdirectory is the old one, forked from qla2xxx from kernel 2.6.26. It is not maintained anymore.</p>
+
+				<p>You can find the latest version of this driver in
+				git://git.qlogic.com/scst-qla2xxx.git. It is now maintained by QLogic, hence
+				located in the QLogic's git. This driver also supports FCoE. See SVN root README for instructions how to integrate it
+				into the SCST build tree.</p>
 
 				<p class="post-footer align-right">					
-					<a href="qla2x00t-howto.html" class="readmore">HOWTO</a>				
 					<a href="downloads.html" class="readmore">Download</a>				
-					<a href="http://sourceforge.net/p/scst/svn/HEAD/tree/" class="readmore">SCST SVN Repository</a>
 				</p>
 				<table border=0><tr><td height="300px">&nbsp;</td></tr></table>
 	  		</div>