diff --git a/Makefile b/Makefile
index fc49c1a..278e44e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ all:
 
 REV=$(shell grep define svnrev/svnrev.c | gawk '{print $$3}')
 
-full_dist: dist dist_vwii
+full_dist: dist dist_vwii pack_forwarder
 
 dist: compile_installer compile_stboot
 	@tar cfj HomebrewFilter-rev$(REV).tar.bz2 HomebrewFilter/
@@ -13,6 +13,10 @@ 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/
 
+pack_forwarder:
+	@tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad" -output "Z:$(PWD)\HBF0.wad" || wine tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad" -output "Z:$(PWD)\HBF0.wad"
+	@tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad.vwii" -output "Z:$(PWD)\HBF0.vWii.wad" || wine tools/WadMii.exe -input "Z:$(PWD)\forwarder\wad" -output "Z:$(PWD)\HBF0.vWii.wad"
+
 clean:
 	@make -C main clean
 	@make -C boot clean
diff --git a/forwarder/wad.vwii/00000000.app b/forwarder/wad.vwii/00000000.app
new file mode 100644
index 0000000..3fd93fd
Binary files /dev/null and b/forwarder/wad.vwii/00000000.app differ
diff --git a/forwarder/wad.vwii/00000001.app b/forwarder/wad.vwii/00000001.app
new file mode 100644
index 0000000..76a527a
Binary files /dev/null and b/forwarder/wad.vwii/00000001.app differ
diff --git a/forwarder/wad.vwii/00000002.app b/forwarder/wad.vwii/00000002.app
new file mode 100644
index 0000000..903bce7
Binary files /dev/null and b/forwarder/wad.vwii/00000002.app differ
diff --git a/forwarder/wad.vwii/0001000148424630.cert b/forwarder/wad.vwii/0001000148424630.cert
new file mode 100644
index 0000000..2184107
Binary files /dev/null and b/forwarder/wad.vwii/0001000148424630.cert differ
diff --git a/forwarder/wad.vwii/0001000148424630.tik b/forwarder/wad.vwii/0001000148424630.tik
new file mode 100644
index 0000000..2da83b5
Binary files /dev/null and b/forwarder/wad.vwii/0001000148424630.tik differ
diff --git a/forwarder/wad.vwii/0001000148424630.tmd b/forwarder/wad.vwii/0001000148424630.tmd
new file mode 100644
index 0000000..5088ec6
Binary files /dev/null and b/forwarder/wad.vwii/0001000148424630.tmd differ
diff --git a/forwarder/wad.vwii/0001000148424630.trailer b/forwarder/wad.vwii/0001000148424630.trailer
new file mode 100644
index 0000000..daabb7e
Binary files /dev/null and b/forwarder/wad.vwii/0001000148424630.trailer differ
diff --git a/forwarder/wad/00000000.app b/forwarder/wad/00000000.app
new file mode 100644
index 0000000..3fd93fd
Binary files /dev/null and b/forwarder/wad/00000000.app differ
diff --git a/forwarder/wad/00000001.app b/forwarder/wad/00000001.app
new file mode 100644
index 0000000..a8d94c8
Binary files /dev/null and b/forwarder/wad/00000001.app differ
diff --git a/forwarder/wad/00000002.app b/forwarder/wad/00000002.app
new file mode 100644
index 0000000..903bce7
Binary files /dev/null and b/forwarder/wad/00000002.app differ
diff --git a/forwarder/wad/0001000148424630.cert b/forwarder/wad/0001000148424630.cert
new file mode 100644
index 0000000..2184107
Binary files /dev/null and b/forwarder/wad/0001000148424630.cert differ
diff --git a/forwarder/wad/0001000148424630.tik b/forwarder/wad/0001000148424630.tik
new file mode 100644
index 0000000..2da83b5
Binary files /dev/null and b/forwarder/wad/0001000148424630.tik differ
diff --git a/forwarder/wad/0001000148424630.tmd b/forwarder/wad/0001000148424630.tmd
new file mode 100644
index 0000000..5088ec6
Binary files /dev/null and b/forwarder/wad/0001000148424630.tmd differ
diff --git a/forwarder/wad/0001000148424630.trailer b/forwarder/wad/0001000148424630.trailer
new file mode 100644
index 0000000..daabb7e
Binary files /dev/null and b/forwarder/wad/0001000148424630.trailer differ
diff --git a/web/HBF0_v4.wad b/web/HBF0_v4.wad
deleted file mode 100644
index 626dec2..0000000
Binary files a/web/HBF0_v4.wad and /dev/null differ