diff --git a/firefox/.signature b/firefox/.signature
index b1e7b7610..059dbbfd9 100644
--- a/firefox/.signature
+++ b/firefox/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF39rOOK9APV5jzcmq9g27Qi/9Pbl6vHj+EgW1YiLiuJP5S42tG72QU1KqHy4yjb3LxWHTuLGG/8X2+CLTeJiBWQ8=
-SHA256 (Pkgfile) = 91c97f95afd4d1cbe3515d5be1cde35fecd8770a85f9c75b8d9d0d2517180a46
+RWSagIOpLGJF35Q2ZGXgZKdbV28M4TgZzlSP7T0SXdD12DmVAicypa4gjHolJLDU4+rdwTZ5LI+1LUiDgjC6gUZocqzMHXuOmgI=
+SHA256 (Pkgfile) = f5f6d2d3c828ae1c22b21c8a0ad5ea44dfa51e2d3cc0d504bcb0821d4b61af17
 SHA256 (.footprint) = 27ff13e160720bbfc07289b241337831458e954cc719d7544cc43c1b6ed370a3
-SHA256 (firefox-91.0.2.source.tar.xz) = 23523af27631e24dd7dbab8429bcd0d828133e9d32b7ab343495c6e15912f6b5
+SHA256 (firefox-92.0.source.tar.xz) = 299a472373021cc9194449c9f4bb962d5f74ef05e8af0448c589761ea34fbc84
 SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91
 SHA256 (0001-Use-remoting-name-for-GDK-application-names.patch) = 8b236bbf3ae5cb28d1dd742f543c0079fac06af5aa80bc2051defeba95f0ae21
diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 762ab535f..b08a379cf 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -5,14 +5,14 @@
 # Optional: sccache jack
 
 name=firefox
-version=91.0.2
+version=92.0
 release=1
 source=(https://archive.mozilla.org/pub/firefox/releases/$version/source/$name-$version.source.tar.xz
 	firefox.desktop
 	0001-Use-remoting-name-for-GDK-application-names.patch)
 
 build() {
-	cd firefox-$version
+	cd $name-$version
 
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
 	patch -p1 -i $SRC/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -26,9 +26,9 @@ build() {
 		export OS_CCACHE_COMPILERCHECK="$(/usr/bin/clang -dumpversion | sed -z 's/\n/ /g'; crux | cut -d' ' -f3)"
 		export CCACHE_COMPILERCHECK="string:$OS_CCACHE_COMPILERCHECK"
 		PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
-	fi	
+	fi
 
-	prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache
+	prt-get isinst sccache && export RUSTC_WRAPPER='/usr/bin/sccache'
 	mkdir "$PKGMK_SOURCE_DIR/rust" || true
 	export CARGO_HOME="$PKGMK_SOURCE_DIR/rust"
 
@@ -36,13 +36,17 @@ cat <<- EOF > .mozconfig
 	mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared
 	unset MOZ_TELEMETRY_REPORTING
 	ac_add_options --prefix=/usr
-	ac_add_options --enable-default-toolkit=cairo-gtk3
 	ac_add_options --enable-application=browser
 	ac_add_options --with-system-jpeg
 	ac_add_options --with-system-zlib
 	ac_add_options --with-system-png
 	ac_add_options --with-system-nspr
 	ac_add_options --with-system-nss
+	#ac_add_options --with-system-harfbuzz
+	#ac_add_options --with-system-graphite2
+	ac_add_options --with-system-libevent
+	ac_add_options --with-system-libvpx
+	ac_add_options --with-system-webp
 	ac_add_options --enable-av1
 	ac_add_options --enable-system-ffi
 	ac_add_options --enable-system-pixman
@@ -51,11 +55,11 @@ cat <<- EOF > .mozconfig
 	ac_add_options --enable-release
 	ac_add_options --enable-rust-simd
 	ac_add_options --disable-debug-symbols
-	ac_add_options --disable-pulseaudio
 	ac_add_options --enable-official-branding
 	ac_add_options --with-distribution-id=nu.crux
 	ac_add_options --enable-extensions=default,-gnomevfs
 	ac_add_options --enable-linker=lld
+	ac_add_options --enable-lto=thin
 	ac_add_options --disable-tests
 	ac_add_options --disable-debug
 	ac_add_options --disable-updater
@@ -64,14 +68,37 @@ cat <<- EOF > .mozconfig
 	ac_add_options --disable-elf-hack
 EOF
 
+	# audio
+	prt-get isinst alsa-lib && echo 'ac_add_options --enable-alsa' >> .mozconfig || echo 'ac_add_options --disable-alsa' >> .mozconfig
+	prt-get isinst jack && echo 'ac_add_options --enable-jack' >> .mozconfig || echo 'ac_add_options --disable-jack' >> .mozconfig
+	prt-get isinst pulseaudio && echo 'ac_add_options --enable-pulseaudio' >> .mozconfig || echo 'ac_add_options --disable-pulseaudio' >> .mozconfig
+
+	prt-get isinst wayland-protocols && \
+		echo 'ac_add_options --enable-default-toolkit=cairo-gtk3-wayland' >> .mozconfig || \
+		echo 'ac_add_options --enable-default-toolkit=cairo-gtk3' >> .mozconfig
+
 	[[ -e '/usr/bin/ccache' ]] && echo 'ac_add_options --enable-ccache' >> .mozconfig
 
 	export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib
 	export MOZ_MAKE_FLAGS="-j ${JOBS-1}"
 	export MOZBUILD_STATE_PATH="$PKGMK_SOURCE_DIR/.mozbuild"
+
+	# Disable notification when build system has finished
 	export MOZ_NOSPAM=1
+
+	# Use system's Python environment
 	export MACH_USE_SYSTEM_PYTHON=1
 
+	# Show flags set at the beginning
+	echo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	echo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	echo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	echo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	echo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL='/usr/bin/bash'
+
 	./mach build
 	#./mach build toolkit/library/rust
 	DESTDIR=$PKG ./mach install