diff --git a/firefox-mozconfig b/firefox-mozconfig
index 953df70..6b4cb54 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -1,6 +1,6 @@
 . $topsrcdir/browser/config/mozconfig
 
-ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
+ac_add_options --enable-default-toolkit=cairo-gtk3
 
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
@@ -20,7 +20,6 @@ ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
 ac_add_options --with-google-api-keyfile=../google-api-key
 ac_add_options --enable-release
 ac_add_options --enable-pie
-ac_add_options --with-gl-provider=EGL
 # Workaround for mozbz#1341234
 ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
 
diff --git a/firefox.spec b/firefox.spec
index 0b69b7a..7e97177 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -433,6 +433,9 @@ echo "ac_add_options --disable-ion" >> .mozconfig
 echo "ac_add_options --disable-stylo" >> .mozconfig
 %endif
 
+# Remove executable bit to make brp-mangle-shebangs happy.
+chmod -x third_party/rust/itertools/src/lib.rs
+
 #---------------------------------------------------------------------
 
 %build