diff --git a/.gitmodules b/.gitmodules
index b1cc182..22244cc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "freepsxboot/FreePSXBoot"]
 	path = freepsxboot/FreePSXBoot
-	url = https://github.com/socram8888/FreePSXBoot
+	url = https://github.com/brad-lin/FreePSXBoot
diff --git a/freepsxboot/FreePSXBoot b/freepsxboot/FreePSXBoot
index a1d7384..63e1e9a 160000
--- a/freepsxboot/FreePSXBoot
+++ b/freepsxboot/FreePSXBoot
@@ -1 +1 @@
-Subproject commit a1d7384943e84f4f087ae5d0f1367d7980a9b197
+Subproject commit 63e1e9a2848d81699a4a11625b3990ba17fc814b
diff --git a/freepsxboot/Makefile b/freepsxboot/Makefile
index 58ddf46..a81cef4 100644
--- a/freepsxboot/Makefile
+++ b/freepsxboot/Makefile
@@ -11,7 +11,7 @@ clean:
 	$(RM) $(FREEPSXBOOT_IMAGES) FreePSXBoot/builder/builder
 
 tonyhax_%.mcd: ../loader/tonyhax.exe FreePSXBoot/builder/builder
-	FreePSXBoot/builder/builder -bw -bios $(patsubst tonyhax_bios_v%.mcd,%,$@) -in ../loader/tonyhax.exe -out $@
+	FreePSXBoot/builder/builder -fastload -bios $(patsubst tonyhax_bios_v%.mcd,%,$@) -in ../loader/tonyhax.exe -out $@
 
 FreePSXBoot/builder/builder:
 	make -C FreePSXBoot/builder all
diff --git a/variables.mk b/variables.mk
index cfa0ec4..f947f9a 100644
--- a/variables.mk
+++ b/variables.mk
@@ -61,5 +61,5 @@ LOADER_FILES := tonyhax.mcs BESLEM-99999TONYHAX tonyhax.exe
 
 # FreePSXBoot images
 
-FREEPSXBOOT_BIOS = v3.0 v4.1 v4.4 v4.5
+FREEPSXBOOT_BIOS = v2.0 v2.1 v2.2 v3.0 v4.1 v4.4 v4.5
 FREEPSXBOOT_IMAGES := $(patsubst %,tonyhax_bios_%.mcd,$(FREEPSXBOOT_BIOS))