diff --git a/Makefile b/Makefile
index 83accef..415da78 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ include $(DEVKITPPC)/wii_rules
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-TARGET		:=	boot
+TARGET		:=	hbf
 BUILD		:=	build
 SOURCES		:=	source \
 			source/BootHomebrew \
diff --git a/boot/Makefile b/boot/Makefile
index f320073..608544f 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -15,7 +15,7 @@ include $(DEVKITPPC)/wii_rules
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-TARGET		:=	boot
+TARGET		:=	hbf_boot
 BUILD		:=	build
 SOURCES		:=	source
 DATA		:=	data  
diff --git a/distribute b/distribute
index 393279c..a62e3b5 100755
--- a/distribute
+++ b/distribute
@@ -7,11 +7,11 @@ compile_hbf ()
 
 compile_boot ()
 {
-	if [[ -e $PWD/boot.dol && ! $FORCE ]]; then
-		cp boot.dol boot/source/hbf.dol
+	if [[ -e $PWD/hbf.dol && ! $FORCE ]]; then
+		cp hbf.dol boot/source/hbf.dol
 		make -C boot/ || exit 1
 	else	compile_hbf
-		cp boot.dol boot/source/hbf.dol
+		cp hbf.dol boot/source/hbf.dol
 		make -C boot/ || exit 1
 	fi
 
@@ -19,10 +19,10 @@ compile_boot ()
 
 compile_installer ()
 {
-	if [[ -e boot/boot.dol && ! $FORCE ]]; then
-		cp boot/boot.dol installer/wad/00000002.app
+	if [[ -e boot/hbf_boot.dol && ! $FORCE ]]; then
+		cp boot/hbf_boot.dol installer/wad/00000002.app
 	else	compile_boot
-		cp boot/boot.dol installer/wad/00000002.app
+		cp boot/hbf_boot.dol installer/wad/00000002.app
 	fi
 
 	wine installer/WadMii.exe -input "Z:\home\chris\Projekte\homebrewfilter\installer\wad" -output "Z:\home\chris\Projekte\homebrewfilter\installer\data\install.wad"
@@ -40,10 +40,10 @@ compile_installer ()
 make_distribution ()
 {
 
-	if [[ -e installer/boot.dol && ! $FORCE ]]; then
-		cp installer/boot.dol HomebrewFilter/
+	if [[ -e installer/installer.dol && ! $FORCE ]]; then
+		cp installer/installer.dol HomebrewFilter/boot.dol
 	else	compile_installer
-		cp installer/boot.dol HomebrewFilter/
+		cp installer/installer.dol HomebrewFilter/boot.dol
 	fi
 
 	XREV=$(grep "define SVN_REV" svnrev/svnrev.c | gawk '{print $3}')
diff --git a/forwarder/Makefile b/forwarder/Makefile
index b6f34e6..20aa0b4 100644
--- a/forwarder/Makefile
+++ b/forwarder/Makefile
@@ -15,11 +15,10 @@ include $(DEVKITPPC)/wii_rules
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-TARGET		:=	boot
+TARGET		:=	forwarder
 BUILD		:=	build
 SOURCES		:=	source \
-				source/Network \
-				../svnrev
+			../svnrev
 DATA		:=	data  
 INCLUDES	:=
 
diff --git a/installer/Makefile b/installer/Makefile
index a0d4cbe..2807e78 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -15,11 +15,11 @@ include $(DEVKITPPC)/wii_rules
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-TARGET		:=	boot
+TARGET		:=	installer
 BUILD		:=	build
 SOURCES		:=	source \
-				source/Network \
-				../svnrev
+			source/Network \
+			../svnrev
 DATA		:=	data  
 INCLUDES	:=
 
diff --git a/installer/wad/0001000154484246.tmd b/installer/wad/0001000154484246.tmd
index 70ea486..aca6fea 100644
Binary files a/installer/wad/0001000154484246.tmd and b/installer/wad/0001000154484246.tmd differ
diff --git a/updates b/updates
index 626ef59..83d4ddb 100644
--- a/updates
+++ b/updates
@@ -11,6 +11,7 @@
 - BUGFIX: return to HBF feature now works again
 - installer now supports Classic-Controller
 - installer now supports GameCube-Controller
+- installer loads HomebrewFilter rather than returning to Systemmenu
 - adopt libwiigui changes from ZERO
 - BUGFIX: loading apps through wiiload works again
 - support passing arguements using wiiload [obcd]
@@ -21,6 +22,7 @@
 - external loaders menu now allows to boot into neek2o
   using overjoy's `nswitch' code. uniiloader entry no
   longer shown when in emulated NAND
+- HBF now supports wiiloader over USB-Gecko [obcd]
 - changed loading address from 0x81230000 to 0x81330000
 - removed all sound related code
 - support for neek2o [obcd]