diff --git a/flatpak/Makefile b/flatpak/Makefile
index 99520e2..2429381 100644
--- a/flatpak/Makefile
+++ b/flatpak/Makefile
@@ -7,10 +7,11 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
 mozbuild=~/.mozbuild
 
 # if arch not passed on commandline, default to x86_64
-ifeq ($(arch),aarch64)
-else
+ifneq ($(arch),x86_64)
+ifneq ($(arch),aarch64)
 arch=x86_64
 endif
+endif
 
 docker_image_name=lw-linux-flatpak-$(arch)
 
@@ -54,6 +55,9 @@ veryclean : clean
 	rm -f "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum"
 	rm -f version source_release
 
+
+
+
 pre-build :
 	./assets/pre_build_patches_mozconfig.sh
 
@@ -67,7 +71,7 @@ package : dir
 	  cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null )
 
 post-package :
-	cp -v librewolf-$(full_version)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(full_version).en-US.linux-x86_64.tar.bz2 .
+	cp -v librewolf-$(full_version)/obj-$(arch)-pc-linux-gnu/dist/librewolf-$(full_version).en-US.linux-$(arch).tar.bz2 .
 	./assets/post_package_distini_etc.sh
 
 artifacts :
@@ -76,8 +80,8 @@ artifacts :
 
 
 
-dir : librewolf-$(full_version)
 
+dir : librewolf-$(full_version)
 
 librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz
 	rm -rf $@
@@ -88,6 +92,10 @@ librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz
 #	(cd librewolf-$(full_version) && patch -p1 -i ../assets/tryfix-reslink-fail.patch)
 #	(cd librewolf-$(full_version) && patch -p1 -i ../assets/fix-l10n-package-cmd.patch)
 
+
+
+
+
 docker-build :
 	docker build -t $(docker_image_name) - < assets/Dockerfile
 
@@ -97,10 +105,22 @@ docker-run :
 docker-clean :
 	docker rmi $(docker_image_name)
 
+
+
+
 bootstrap : dir
+	rustup target add aarch64-unknown-linux-gnu
+	( export t=$$(pwd)/librewolf-$(full_version) && \
+	 cd $(mozbuild) && \
+	  $$t/mach artifact toolchain --from-build sysroot-aarch64-linux-gnu && \
+	  $$t/mach artifact toolchain --from-build linux64-binutils && \
+	  $$t/mach artifact toolchain --from-build linux64-cctools-port && \
+	 true )
 	(cd librewolf-$(full_version) && ./mach --no-interactive bootstrap --application-choice=browser)
 
 
+
+
 setup-debian :
 	apt-get -y install mercurial python3 python3-dev python3-pip curl wget dpkg-sig  libssl-dev zstd
 
diff --git a/flatpak/assets/mozconfig.aarch64 b/flatpak/assets/mozconfig.aarch64
index 86b2d32..53e1878 100644
--- a/flatpak/assets/mozconfig.aarch64
+++ b/flatpak/assets/mozconfig.aarch64
@@ -1,19 +1,11 @@
-
-ac_add_options --target=aarch64-linux-gnu
+ac_add_options --target=aarch64-pc-linux-gnu
+ac_add_options --enable-linker=lld
 ac_add_options --enable-bootstrap
 
-# taken from manjaro build:
-ac_add_options --enable-optimize="-g0 -O2"
 
-export AR=llvm-ar
-export NM=llvm-nm
-export RANLIB=llvm-ranlib
 
 # ---
 
-# We should fix this one..
-#ac_add_options --without-wasm-sandboxed-libraries
-
 
 #
 # Librewolf specific settings
diff --git a/flatpak/assets/mozconfig.x86_64 b/flatpak/assets/mozconfig.x86_64
index 2ceddb6..110d534 100644
--- a/flatpak/assets/mozconfig.x86_64
+++ b/flatpak/assets/mozconfig.x86_64
@@ -1,12 +1,7 @@
-#ac_add_options --target=aarch64-linux-gnu
-ac_add_options --target=x86_64-linux-gnu
+ac_add_options --target=x86_64-pc-linux-gnu
 ac_add_options --enable-bootstrap
 
 
-# We should fix this one..
-#ac_add_options --without-wasm-sandboxed-libraries
-
-
 #
 # Librewolf specific settings
 #