diff --git a/qla2x00t/qla_iocb.c b/qla2x00t/qla_iocb.c
index 686e624b1..aa236d2ae 100644
--- a/qla2x00t/qla_iocb.c
+++ b/qla2x00t/qla_iocb.c
@@ -409,9 +409,8 @@ qla2x00_start_scsi(srb_t *sp)
 	/* Set target ID and LUN number*/
 	SET_TARGET_ID(ha, cmd_pkt->target, sp->fcport->loop_id);
 	cmd_pkt->lun = cpu_to_le16(cmd->device->lun);
-
-	/* Update tagged queuing modifier */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+	/* Update tagged queuing modifier */
 	if (scsi_populate_tag_msg(cmd, tag)) {
 		switch (tag[0]) {
 		case HEAD_OF_QUEUE_TAG:
@@ -1402,11 +1401,10 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
 	cmd_pkt->fcp_cmnd_dseg_address[1] = cpu_to_le32(
 	    MSD(crc_ctx_dma + CRC_CONTEXT_FCPCMND_OFF));
 	fcp_cmnd->task_management = 0;
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
 	/*
 	 * Update tagged queuing modifier if using command tag queuing
 	 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
 	if (scsi_populate_tag_msg(cmd, tag)) {
 		switch (tag[0]) {
 		case HEAD_OF_QUEUE_TAG:
diff --git a/scst.spec.in b/scst.spec.in
index 43babc7d0..99a18b157 100644
--- a/scst.spec.in
+++ b/scst.spec.in
@@ -133,12 +133,6 @@ rm -f /usr/local/man/man8/iscsi-scstd.8
 rm -f /usr/local/sbin/iscsi-scst-adm
 rm -f /usr/local/sbin/iscsi-scstd
 rm -rf /usr/local/include/scst
-rm -f /usr/local/man/man5/iscsi-scstd.conf.5
-rm -f /usr/local/man/man8/iscsi-scst-adm.8
-rm -f /usr/local/man/man8/iscsi-scstd.8
-rm -f /usr/local/sbin/iscsi-scst-adm
-rm -f /usr/local/sbin/iscsi-scstd
-rm -rf /usr/local/include/scst
 
 %post
 /sbin/depmod -a %{kversion}
@@ -171,13 +165,6 @@ rm -rf /usr/local/include/scst
 %{_sbindir}/iscsi-scstd
 %dir /var/lib/scst/pr
 %dir /var/lib/scst/vdev_mode_pages
-%{_mandir}/man5/iscsi-scstd.conf.5.gz
-%{_mandir}/man8/iscsi-scst-adm.8.gz
-%{_mandir}/man8/iscsi-scstd.8.gz
-%{_sbindir}/iscsi-scst-adm
-%{_sbindir}/iscsi-scstd
-%dir /var/lib/scst/pr
-%dir /var/lib/scst/vdev_mode_pages
 
 %files devel
 %defattr(-,root,root)
diff --git a/scstadmin/Makefile b/scstadmin/Makefile
index eebdbc9fe..72bb5b831 100644
--- a/scstadmin/Makefile
+++ b/scstadmin/Makefile
@@ -83,6 +83,10 @@ install install_vendor:
 	    fi								\
 	  fi								\
 	done
+	# Remove the files that are obsolete since SCST-SCST has been
+	# renamed into SCST_SCST.
+	rm -rf "$(DESTDIR)$$(/usr/bin/perl -V:sitearch | sed "s|.*='||;s|'.*||")/auto/SCST-SCST"
+	# Install the files that have just been built.
 	install -d $(DESTDIR)$(INITDIR)
 	tmp=/tmp/scst-initd-$$$$ && init.d/scst >$$tmp &&               \
 	  install -m 755 $$tmp $(DESTDIR)$(INITDIR)/scst &&             \
diff --git a/scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL b/scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL
index 5b400f804..621b905d9 100644
--- a/scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL
+++ b/scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL
@@ -1,12 +1,12 @@
 #!/usr/bin/perl -w
 #
-# Makefile for the SCST-SCST perl module
+# Makefile for the SCST_SCST perl module
 #
 
 use ExtUtils::MakeMaker;
 
 WriteMakefile(
-        'NAME'          => 'SCST-SCST',
+        'NAME'          => 'SCST_SCST',
         'VERSION_FROM'  => 'lib/SCST/SCST.pm',
         'AUTHOR'        => 'Mark R. Buechler <Mark.Buechler@gmail.com>',
         'PREREQ_PM'     => {},
diff --git a/scstadmin/scstadmin.procfs/scst-0.8.22/README b/scstadmin/scstadmin.procfs/scst-0.8.22/README
index 95df1880b..75b5b8f1f 100644
--- a/scstadmin/scstadmin.procfs/scst-0.8.22/README
+++ b/scstadmin/scstadmin.procfs/scst-0.8.22/README
@@ -1,15 +1,15 @@
-SCST-SCST is a perl module for querying and configuring SCST.
+SCST_SCST is a perl module for querying and configuring SCST.
 
 
 AVAILABILITY
 
-Currently SCST-SCST ships with SCST itself available from
+Currently SCST_SCST ships with SCST itself available from
 http://scst.sourceforge.net.
 
 
 INSTALLATION
 
-Install SCST-SCST as you would any other perl module:
+Install SCST_SCST as you would any other perl module:
 
    perl Makefile.PL
    make
diff --git a/scstadmin/scstadmin.spec.in b/scstadmin/scstadmin.spec.in
index e1c57cf7f..3105c71f3 100644
--- a/scstadmin/scstadmin.spec.in
+++ b/scstadmin/scstadmin.spec.in
@@ -69,7 +69,7 @@ rm -f /usr/local/man/man5/scst.conf.5*
 /etc/init.d/scst
 %{_sbindir}/scstadmin
 %{perl_vendorlib}/SCST
-%{perl_vendorarch}/auto/SCST-SCST
+%{perl_vendorarch}/auto/SCST_SCST
 %{_mandir}/man1/scstadmin.1*
 %{scstadmin_perl_installvendorman3dir}/SCST::SCST.3pm*
 %{_mandir}/man5/scst.5*
diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/Makefile.PL b/scstadmin/scstadmin.sysfs/scst-0.9.10/Makefile.PL
index 5b400f804..621b905d9 100644
--- a/scstadmin/scstadmin.sysfs/scst-0.9.10/Makefile.PL
+++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/Makefile.PL
@@ -1,12 +1,12 @@
 #!/usr/bin/perl -w
 #
-# Makefile for the SCST-SCST perl module
+# Makefile for the SCST_SCST perl module
 #
 
 use ExtUtils::MakeMaker;
 
 WriteMakefile(
-        'NAME'          => 'SCST-SCST',
+        'NAME'          => 'SCST_SCST',
         'VERSION_FROM'  => 'lib/SCST/SCST.pm',
         'AUTHOR'        => 'Mark R. Buechler <Mark.Buechler@gmail.com>',
         'PREREQ_PM'     => {},
diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/README b/scstadmin/scstadmin.sysfs/scst-0.9.10/README
index 611c795af..34e6085ed 100644
--- a/scstadmin/scstadmin.sysfs/scst-0.9.10/README
+++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/README
@@ -1,15 +1,15 @@
-SCST-SCST is a perl module for querying and configuring SCST.
+SCST_SCST is a perl module for querying and configuring SCST.
 
 
 AVAILABILITY
 
-Currently SCST-SCST ships with SCST itself available from
+Currently SCST_SCST ships with SCST itself available from
 http://scst.sourceforge.net.
 
 
 INSTALLATION
 
-Install SCST-SCST as you would any other perl module:
+Install SCST_SCST as you would any other perl module:
 
    perl Makefile.PL
    make