diff --git a/Makefile.griffin b/Makefile.griffin
index 88b71e049f..7cc406368a 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -139,7 +139,7 @@ ifeq ($(platform), wii)
   HAVE_LIBRETRO_MANAGEMENT := 1
   HAVE_LIBSICKSAXIS        := 1
 
-  APP_BOOTER_DIR = wii/app_booter
+  APP_BOOTER_DIR = bootstrap/wii/app_booter
   PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
 ifeq ($(USBGECKO), 1)
   CFLAGS += -DUSBGECKO
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 1800ce3d74..9bdc2a11c3 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -37,7 +37,7 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
 LIBS := -lfat -lwiiuse -logc -lbte
 
-APP_BOOTER_DIR = wii/app_booter
+APP_BOOTER_DIR = bootstrap/wii/app_booter
 
 OBJ = frontend/frontend_salamander.o \
 		frontend/frontend_driver.o \
diff --git a/wii/app_booter/Makefile b/bootstrap/wii/app_booter/Makefile
similarity index 100%
rename from wii/app_booter/Makefile
rename to bootstrap/wii/app_booter/Makefile
diff --git a/wii/app_booter/crt0.s b/bootstrap/wii/app_booter/crt0.s
similarity index 100%
rename from wii/app_booter/crt0.s
rename to bootstrap/wii/app_booter/crt0.s
diff --git a/wii/app_booter/elf_abi.h b/bootstrap/wii/app_booter/elf_abi.h
similarity index 100%
rename from wii/app_booter/elf_abi.h
rename to bootstrap/wii/app_booter/elf_abi.h
diff --git a/wii/app_booter/link.ld b/bootstrap/wii/app_booter/link.ld
similarity index 100%
rename from wii/app_booter/link.ld
rename to bootstrap/wii/app_booter/link.ld
diff --git a/wii/app_booter/main.c b/bootstrap/wii/app_booter/main.c
similarity index 100%
rename from wii/app_booter/main.c
rename to bootstrap/wii/app_booter/main.c