diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index 72867a8cb0..1c9b84e562 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -1,17 +1,20 @@
 # Template build file for 'icecat'.
 pkgname=icecat
-version=38.5.2
+version=38.6.0
 revision=1
 short_desc="GNU version of the Firefox browser"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 homepage="https://www.gnu.org/software/${pkgname}/"
 license="MPL-1.1, GPL-2, LGPL-2.1"
 distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2"
-checksum="8f99b9cb966404665085f87f1d532a22f3b0d422bfb49eb8f202b40c96ef2854"
+checksum="9d0e10005c28d130d262176280656dc3cf374717723bd715d3d6a3cc5999a42d"
 
 nopie=yes
 lib32disabled=yes
 
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1243724
+CFLAGS="-DBROTLI_BUILD_PORTABLE"
+
 hostmakedepends="unzip zip pkg-config perl python yasm"
 makedepends="nss-devel libjpeg-turbo-devel icu-devel
  pixman-devel sqlite-devel gst-plugins-base1-devel gtk+-devel
@@ -23,7 +26,8 @@ depends="desktop-file-utils hicolor-icon-theme"
 
 # Make config/system_wrappers/alsa/alsalib.h and pulse/pulse.h find
 # the required includes
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/alsa \
+CFLAGS+="\
+	-I${XBPS_CROSS_BASE}/usr/include/alsa \
 	-I${XBPS_CROSS_BASE}/usr/include/pulse \
 	-I${XBPS_CROSS_BASE}/usr/include/nspr \
 	-I${XBPS_CROSS_BASE}/usr/include/nss"
@@ -55,7 +59,6 @@ do_configure() {
 		export ac_cv_sqlite_threadsafe=yes
 		export ac_cv_sqlite_enable_fts3=yes
 		export ac_cv_sqlite_enable_unlock_notify=yes
-		export ac_cv_prog_hostcxx_works=1
 		# Fix wrong assignment of (modified) $HOST_CXXFLAGS in js/src/configure
 		sed -i js/src/configure \
 			-e "s;CFLAGS=\"\$HOST_CXXFLAGS\";CFLAGS=\"${XBPS_CXXFLAGS}\";"
@@ -84,51 +87,52 @@ do_configure() {
 		--libdir=/usr/lib \
 		--with-system-nspr \
 		--with-system-nss \
-		--with-system-bz2  \
 		--with-system-jpeg \
 		--with-system-zlib \
+		--with-system-bz2  \
 		--without-system-png \
 		--with-system-libevent \
 		--with-system-libvpx \
-		--enable-system-cairo  \
-		--enable-system-pixman \
+		--with-system-icu \
 		--enable-system-hunspell \
 		--enable-system-sqlite \
 		--enable-system-ffi \
+		--enable-system-cairo  \
+		--enable-system-pixman \
 		--enable-startup-notification \
+		--enable-pulseaudio \
+		--enable-gstreamer=1.0 \
 		--disable-gio \
 		--with-pthreads \
 		--enable-official-branding \
 		--enable-safe-browsing \
 		--enable-url-classifier \
+		--disable-crashreporter \
 		--disable-skia \
 		--disable-debug \
 		--disable-gnomevfs \
 		--disable-gconf \
-		--disable-crashreporter \
+		--disable-pie \
+		--disable-profiling \
+		--disable-profilelocking \
+		--disable-installer \
 		--disable-updater \
 		--disable-xprint \
 		--disable-tests \
 		--disable-mochitest \
 		--disable-installer \
-		--disable-elf-hack \
-		--with-system-icu \
-		--enable-pulseaudio \
-		--enable-gstreamer=1.0 \
-		--disable-cpp-exceptions \
-		--disable-javaxpcom \
-		--with-nspr-prefix=${XBPS_CROSS_BASE}/usr \
-		--with-nss-prefix=${XBPS_CROSS_BASE}/usr \
-		--with-google-api-keyfile="${wrksrc}/google-api-key" \
-		--enable-optimize="$CFLAGS -fPIC" \
-		--disable-strip \
-		--enable-gold=no \
-		--disable-install-strip \
 		--disable-static \
 		--disable-jemalloc \
-		--enable-pie \
-		--disable-profiling \
-		--disable-profilelocking \
+		--disable-elf-hack \
+		--disable-strip \
+		--disable-install-strip \
+		--disable-cpp-exceptions \
+		--disable-javaxpcom \
+		--with-nspr-prefix="${XBPS_CROSS_BASE}/usr" \
+		--with-nss-prefix="${XBPS_CROSS_BASE}/usr" \
+		--with-google-api-keyfile="${wrksrc}/google-api-key" \
+		--enable-optimize="$CFLAGS" \
+		--enable-gold=yes \
 		${cross_args}
 }
 do_build() {