diff --git a/Makefile b/Makefile
index 7512fcd..4f048d9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,11 @@ all:
 
 REV=$(shell grep define svnrev/svnrev.c | gawk '{print $$3}')
 
-dist: compile_installer
+dist: compile_installer compile_stboot
 	@tar cfj HomebrewFilter-rev$(REV).tar.bz2 HomebrewFilter/
 	@tar cfj HomebrewFilter-Standalone-rev$(REV).tar.bz2 HomebrewFilter.Standalone/
 
-dist_vwii: compile_installer_vwii
+dist_vwii: compile_installer_vwii compile_stboot_vwii
 	@tar cfj HomebrewFilter-vWii-rev$(REV).tar.bz2 HomebrewFilter.vWii/
 	@tar cfj HomebrewFilter-vWii-Standalone-rev$(REV).tar.bz2 HomebrewFilter.vWii.Standalone/
 
@@ -29,9 +29,27 @@ nand_loader:
 libruntimeiospatch:
 	@make -C libruntimeiospatch
 
+compile_stboot: clean
+	@echo "============================"
+	@echo "== HBF Standalone for Wii =="
+	@echo "============================"
+	@XFLAGS="-DSTBOOT" make -C main
+	@cp main/hbf.dol boot/source/hbf.dol
+	@make -C boot
+	@cp boot/hbf_boot.dol HomebrewFilter.Standalone/boot.dol
+
+compile_stboot_vwii: clean_vwii
+	@echo "============================="
+	@echo "== HBF Standalone for vWii =="
+	@echo "============================="
+	@XFLAGS="-DSTBOOTVWII -DVWII" make -C main
+	@cp main/hbf.dol boot/source/hbf.dol
+	@make -C boot
+	@cp boot/hbf_boot.dol HomebrewFilter.vWii.Standalone/boot.dol
+
 compile_hbf: clean
 	@echo "==========================="
-	@echo "======= HBF for Wii ======="
+	@echo "== HBF Installer for Wii =="
 	@echo "==========================="
 	@make -C main
 	@cp main/hbf.dol boot/source/hbf.dol
@@ -39,7 +57,6 @@ compile_hbf: clean
 compile_boot: compile_hbf
 	@make -C boot
 	@cp boot/hbf_boot.dol installer/wad/00000001.app
-	@cp boot/hbf_boot.dol HomebrewFilter.Standalone/boot.dol
 
 compile_installer: compile_boot
 	@tools/WadMii.exe -input "Z:$(PWD)\installer\wad" -output "Z:$(PWD)\installer\data\install.wad" || wine tools/WadMii.exe -input "Z:$(PWD)\installer\wad" -output "Z:$(PWD)\installer\data\install.wad"
@@ -48,14 +65,13 @@ compile_installer: compile_boot
 
 compile_hbf_vwii: clean_vwii
 	@echo "============================"
-	@echo "======= HBF for vWii ======="
+	@echo "== HBF Installer for vWii =="
 	@echo "============================"
-	@CFLAGS="$(CFLAGS) -DVWII" make -C main
+	@XFLAGS="-DVWII" make -C main
 	@cp main/hbf.dol boot/source/hbf.dol
 
 compile_boot_vwii: compile_hbf_vwii
 	@make -C boot
-	@cp boot/hbf_boot.dol HomebrewFilter.vWii.Standalone/boot.dol
 	@cp boot/hbf_boot.dol installer/wad.vwii/00000002.app
 
 compile_installer_vwii: compile_boot_vwii
diff --git a/NEWS b/NEWS
index 814a515..9a5115d 120000
--- a/NEWS
+++ b/NEWS
@@ -1 +1 @@
-updates
\ No newline at end of file
+web/updates
\ No newline at end of file
diff --git a/main/Makefile b/main/Makefile
index 6494cd4..4b25984 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -40,7 +40,7 @@ DATA		:=	data/fonts \
 # options for code generation
 #---------------------------------------------------------------------------------
 
-CFLAGS		=	-g -O2 -Wall $(MACHDEP) $(INCLUDE)
+CFLAGS		=	-g -O2 -Wall $(MACHDEP) $(INCLUDE) $(XFLAGS)
 CXXFLAGS	=	-save-temps -Xassembler -aln=$@.lst $(CFLAGS)
 LDFLAGS		=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--section-start,.init=0x81330000
 #LDFLAGS		=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
diff --git a/main/source/Network/network.cpp b/main/source/Network/network.cpp
index e83c9c7..b1b85dd 100644
--- a/main/source/Network/network.cpp
+++ b/main/source/Network/network.cpp
@@ -54,7 +54,15 @@ void CheckVersion(void)
 {
 	if(Settings.checkrev == -1)
 	{
+#ifdef STBOOTVWII
+		struct block file = downloadfile("http://www.nanolx.org/hbf/DOL.st.vwii/revisions.st.vwii");
+#elif VWII
+		struct block file = downloadfile("http://www.nanolx.org/hbf/DOL.vwii/revisions.vwii");
+#elif STBOOT
+		struct block file = downloadfile("http://www.nanolx.org/hbf/DOL.st/revisions.st");
+#else
 		struct block file = downloadfile("http://www.nanolx.org/hbf/DOL/revisions");
+#endif
 		if (file.data != NULL)
 		{
 			revs = (char*)file.data;
diff --git a/revisions b/web/revisions
similarity index 100%
rename from revisions
rename to web/revisions
diff --git a/revisions.vwii b/web/revisions.vwii
similarity index 100%
rename from revisions.vwii
rename to web/revisions.vwii
diff --git a/updates b/web/updates
similarity index 100%
rename from updates
rename to web/updates
diff --git a/updates.vwii b/web/updates.vwii
similarity index 100%
rename from updates.vwii
rename to web/updates.vwii