diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index 4b0d7842eb22..3662168807de 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icc
-PORTVERSION=	7.1.018
+PORTVERSION=	7.1.019
 #PORTREVISION=	1
 CATEGORIES=	lang linux devel
 MASTER_SITES=
@@ -23,6 +23,7 @@ NO_PACKAGE=	${RESTRICTED}
 NO_CDROM=	${RESTRICTED}
 
 ONLY_FOR_ARCHS=		i386
+CONFLICS=		linux_devtools* ifc*
 
 USE_LINUX=		yes
 USE_REINPLACE=		yes
@@ -63,12 +64,12 @@ post-extract:
 		${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude
 .endif
 .for i in \
-	intel-icc7-7.1-18.i386.rpm
-#	intel-iidb7-7.1-36.i386.rpm \
-#	intel-isubh7-7.1-18.i386.rpm \
-#	intel-ecc7-7.1-18.ia64.rpm \
-#	intel-eidb7-7.1-36.ia64.rpm \
-#	intel-esubh7-7.1-18.ia64.rpm
+	intel-icc7-7.1-21.i386.rpm
+#	intel-iidb7-7.1-42.i386.rpm \
+#	intel-isubh7-7.1-21.i386.rpm \
+#	intel-ecc7-7.1-21.ia64.rpm \
+#	intel-eidb7-7.1-42.ia64.rpm \
+#	intel-esubh7-7.1-21.ia64.rpm
 	@cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \
 		${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
diff --git a/lang/icc/distinfo b/lang/icc/distinfo
index 750d64d7ba01..f17deaa94c24 100644
--- a/lang/icc/distinfo
+++ b/lang/icc/distinfo
@@ -1 +1 @@
-MD5 (l_cc_pc_7.1.018.tar) = b95ff56ea173aa10709f85aac0b3a59d
+MD5 (l_cc_pc_7.1.019.tar) = b94f9ce4646cc889c9e6e9f0cddcf80c
diff --git a/lang/icc/files/cpio-exclude b/lang/icc/files/cpio-exclude
index d8f3cf9ae6bb..d2857257294f 100644
--- a/lang/icc/files/cpio-exclude
+++ b/lang/icc/files/cpio-exclude
@@ -37,6 +37,7 @@
 */opt/intel/%%COMPILERDIR%%/ia32/include/omp_lib.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/ostream
 */opt/intel/%%COMPILERDIR%%/ia32/include/queue
+*/opt/intel/%%COMPILERDIR%%/ia32/include/queue.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/regex.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/set
 */opt/intel/%%COMPILERDIR%%/ia32/include/slist
diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile
index 4b0d7842eb22..3662168807de 100644
--- a/lang/icc7/Makefile
+++ b/lang/icc7/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icc
-PORTVERSION=	7.1.018
+PORTVERSION=	7.1.019
 #PORTREVISION=	1
 CATEGORIES=	lang linux devel
 MASTER_SITES=
@@ -23,6 +23,7 @@ NO_PACKAGE=	${RESTRICTED}
 NO_CDROM=	${RESTRICTED}
 
 ONLY_FOR_ARCHS=		i386
+CONFLICS=		linux_devtools* ifc*
 
 USE_LINUX=		yes
 USE_REINPLACE=		yes
@@ -63,12 +64,12 @@ post-extract:
 		${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude
 .endif
 .for i in \
-	intel-icc7-7.1-18.i386.rpm
-#	intel-iidb7-7.1-36.i386.rpm \
-#	intel-isubh7-7.1-18.i386.rpm \
-#	intel-ecc7-7.1-18.ia64.rpm \
-#	intel-eidb7-7.1-36.ia64.rpm \
-#	intel-esubh7-7.1-18.ia64.rpm
+	intel-icc7-7.1-21.i386.rpm
+#	intel-iidb7-7.1-42.i386.rpm \
+#	intel-isubh7-7.1-21.i386.rpm \
+#	intel-ecc7-7.1-21.ia64.rpm \
+#	intel-eidb7-7.1-42.ia64.rpm \
+#	intel-esubh7-7.1-21.ia64.rpm
 	@cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \
 		${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet
 .endfor
diff --git a/lang/icc7/distinfo b/lang/icc7/distinfo
index 750d64d7ba01..f17deaa94c24 100644
--- a/lang/icc7/distinfo
+++ b/lang/icc7/distinfo
@@ -1 +1 @@
-MD5 (l_cc_pc_7.1.018.tar) = b95ff56ea173aa10709f85aac0b3a59d
+MD5 (l_cc_pc_7.1.019.tar) = b94f9ce4646cc889c9e6e9f0cddcf80c
diff --git a/lang/icc7/files/cpio-exclude b/lang/icc7/files/cpio-exclude
index d8f3cf9ae6bb..d2857257294f 100644
--- a/lang/icc7/files/cpio-exclude
+++ b/lang/icc7/files/cpio-exclude
@@ -37,6 +37,7 @@
 */opt/intel/%%COMPILERDIR%%/ia32/include/omp_lib.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/ostream
 */opt/intel/%%COMPILERDIR%%/ia32/include/queue
+*/opt/intel/%%COMPILERDIR%%/ia32/include/queue.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/regex.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/set
 */opt/intel/%%COMPILERDIR%%/ia32/include/slist