diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index f8388001f14f..3966ec7307f4 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icc
-PORTVERSION=	7.1.017
+PORTVERSION=	7.1.018
 #PORTREVISION=	1
 CATEGORIES=	lang linux devel
 MASTER_SITES=
@@ -46,7 +46,7 @@ CPIO?=		/usr/bin/cpio
 OBJCOPY?=	/usr/bin/objcopy
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	"Please manually download ${DISTFILES} from ${ICC_SITE}, ${ICC_SITE}clin/noncom.htm or https://premier.intel.com/ \(whichever has the file, to access premier.intel.com you have to register at http://www.intel.com/software/products/registrationcenter/index.htm\). With a little bit of luck it may also be available from ftp://download.intel.com/software/products/compilers/downloads/. Put it into ${DISTDIR} and run make again"
+IGNORE=	"Please manually download ${DISTFILES} from ${ICC_SITE}, ${ICC_SITE}clin/noncom.htm or https://premier.intel.com/ \(whichever has the file; to access premier.intel.com you have to register at http://www.intel.com/software/products/registrationcenter/index.htm; LOOK AT ALL 3 LOCATIONS, not every version is everywhere, but premier.intel.com has always the newest version\). With a little bit of luck it may also be available from ftp://download.intel.com/software/products/compilers/downloads/. Put it into ${DISTDIR} and run make again"
 .endif
 
 .if exists(${LINUXBASE}/boot/kernel.h) || \
@@ -63,12 +63,12 @@ post-extract:
 		${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude
 .endif
 .for i in \
-	intel-icc7-7.1-16.i386.rpm
-#	intel-iidb7-7.1-33.i386.rpm \
-#	intel-isubh7-7.1-16.i386.rpm \
-#	intel-ecc7-7.1-16.ia64.rpm \
-#	intel-eidb7-7.1-33.ia64.rpm \
-#	intel-esubh7-7.1-16.ia64.rpm
+	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
 	@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 61b81e0deb8c..750d64d7ba01 100644
--- a/lang/icc/distinfo
+++ b/lang/icc/distinfo
@@ -1 +1 @@
-MD5 (l_cc_pc_7.1.017.tar) = 20522069b44edee022bb9e2af0e5336f
+MD5 (l_cc_pc_7.1.018.tar) = b95ff56ea173aa10709f85aac0b3a59d
diff --git a/lang/icc/pkg-plist b/lang/icc/pkg-plist
index 071ab9127083..d1dc498a8dd4 100644
--- a/lang/icc/pkg-plist
+++ b/lang/icc/pkg-plist
@@ -775,7 +775,7 @@ intel/%%COMPILERDIR%%/docs/csupport
 %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/flex_ug.pdf
 %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/icid.htm
 %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/icpi.htm
-%%PORTDOCS%%intel/%%COMPILERDIR%%/docs/notes/icc_fixes.txt
+@comment %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/notes/icc_fixes.txt
 %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/notes/icc_issues.txt
 %%PORTDOCS%%@dirrm intel/%%COMPILERDIR%%/docs/notes
 %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/ref/ann_entr.htm
diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile
index f8388001f14f..3966ec7307f4 100644
--- a/lang/icc7/Makefile
+++ b/lang/icc7/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icc
-PORTVERSION=	7.1.017
+PORTVERSION=	7.1.018
 #PORTREVISION=	1
 CATEGORIES=	lang linux devel
 MASTER_SITES=
@@ -46,7 +46,7 @@ CPIO?=		/usr/bin/cpio
 OBJCOPY?=	/usr/bin/objcopy
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	"Please manually download ${DISTFILES} from ${ICC_SITE}, ${ICC_SITE}clin/noncom.htm or https://premier.intel.com/ \(whichever has the file, to access premier.intel.com you have to register at http://www.intel.com/software/products/registrationcenter/index.htm\). With a little bit of luck it may also be available from ftp://download.intel.com/software/products/compilers/downloads/. Put it into ${DISTDIR} and run make again"
+IGNORE=	"Please manually download ${DISTFILES} from ${ICC_SITE}, ${ICC_SITE}clin/noncom.htm or https://premier.intel.com/ \(whichever has the file; to access premier.intel.com you have to register at http://www.intel.com/software/products/registrationcenter/index.htm; LOOK AT ALL 3 LOCATIONS, not every version is everywhere, but premier.intel.com has always the newest version\). With a little bit of luck it may also be available from ftp://download.intel.com/software/products/compilers/downloads/. Put it into ${DISTDIR} and run make again"
 .endif
 
 .if exists(${LINUXBASE}/boot/kernel.h) || \
@@ -63,12 +63,12 @@ post-extract:
 		${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude
 .endif
 .for i in \
-	intel-icc7-7.1-16.i386.rpm
-#	intel-iidb7-7.1-33.i386.rpm \
-#	intel-isubh7-7.1-16.i386.rpm \
-#	intel-ecc7-7.1-16.ia64.rpm \
-#	intel-eidb7-7.1-33.ia64.rpm \
-#	intel-esubh7-7.1-16.ia64.rpm
+	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
 	@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 61b81e0deb8c..750d64d7ba01 100644
--- a/lang/icc7/distinfo
+++ b/lang/icc7/distinfo
@@ -1 +1 @@
-MD5 (l_cc_pc_7.1.017.tar) = 20522069b44edee022bb9e2af0e5336f
+MD5 (l_cc_pc_7.1.018.tar) = b95ff56ea173aa10709f85aac0b3a59d
diff --git a/lang/icc7/pkg-plist b/lang/icc7/pkg-plist
index 071ab9127083..d1dc498a8dd4 100644
--- a/lang/icc7/pkg-plist
+++ b/lang/icc7/pkg-plist
@@ -775,7 +775,7 @@ intel/%%COMPILERDIR%%/docs/csupport
 %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/flex_ug.pdf
 %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/icid.htm
 %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/icpi.htm
-%%PORTDOCS%%intel/%%COMPILERDIR%%/docs/notes/icc_fixes.txt
+@comment %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/notes/icc_fixes.txt
 %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/notes/icc_issues.txt
 %%PORTDOCS%%@dirrm intel/%%COMPILERDIR%%/docs/notes
 %%PORTDOCS%%intel/%%COMPILERDIR%%/docs/ref/ann_entr.htm