diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 9369e6288c76..3f77dbe85e4b 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,60 +1,60 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 
 PORTNAME=	firefox
-DISTVERSION=	92.0.1
+DISTVERSION=	93.0
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
-		nss>=3.69:security/nss \
+		nss>=3.70:security/nss \
 		icu>=67.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=2.8.1:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.37:graphics/png \
 		libvpx>=1.8.2:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr
 USE_MOZILLA=	-sqlite
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 USES=		tar:xz
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
 		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
 	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
 
 post-install:
 	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 41c3191267ab..4d6458d79e11 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632397287
-SHA256 (firefox-92.0.1.source.tar.xz) = 9096b22e162cd299080d5eef8f3627a71a594ceba2b89e3000f2c3e8ea603eb1
-SIZE (firefox-92.0.1.source.tar.xz) = 383567460
+TIMESTAMP = 1632868474
+SHA256 (firefox-93.0.source.tar.xz) = a78f080f5849bc284b84299f3540934a12e961a7ea368b592ae6576ea1f97102
+SIZE (firefox-93.0.source.tar.xz) = 382181136
diff --git a/www/firefox/files/patch-bug1602730_comment5 b/www/firefox/files/patch-bug1602730_comment5
index 49f9f4321df8..212221b6d5cf 100644
--- a/www/firefox/files/patch-bug1602730_comment5
+++ b/www/firefox/files/patch-bug1602730_comment5
@@ -1,24 +1,24 @@
 --- gfx/layers/composite/CompositableHost.cpp.orig	2020-09-12 21:47:42 UTC
 +++ gfx/layers/composite/CompositableHost.cpp
-@@ -13,6 +13,7 @@
- #include "ImageHost.h"  // for ImageHostBuffered, etc
+@@ -10,6 +10,7 @@
+ #include "Effects.h"  // for EffectMask, Effect, etc
+ #include "gfxUtils.h"
  #include "Layers.h"
- #include "TiledContentHost.h"  // for TiledContentHost
 +#include "mozilla/EndianUtils.h"
  #include "mozilla/gfx/gfxVars.h"
  #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor
  #include "mozilla/layers/TextureHost.h"     // for TextureHost, etc
-@@ -92,9 +93,13 @@ bool CompositableHost::AddMaskEffect(EffectChain& aEff
+@@ -89,9 +90,13 @@
    }
    MOZ_ASSERT(source);
  
 +  // Setting an alpha-mask here breaks the URL-bar on big endian (s390x)
 +  // if the typed URL is too long for the textbox (automatic scrolling needed)
 +#if MOZ_LITTLE_ENDIAN()
    RefPtr<EffectMask> effect =
        new EffectMask(source, source->GetSize(), aTransform);
    aEffects.mSecondaryEffects[EffectTypes::MASK] = effect;
 +#endif
    return true;
  }