diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 5c471550d..bfc74488a 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -175,11 +175,11 @@ TESTGAME_OBJ=$(TESTGAME_ROOT)/$(obj)
 
 TEST_CFLAGS=-I$(TESTGAME_SRC)
 
-TESTGAME ?= testgame$(EXESUFFIX)
-TESTEDITOR ?= testeditor$(EXESUFFIX)
+TESTGAME ?= testgame
+TESTEDITOR ?= testeditor
 
-TESTGAME_TARGET:=$(TESTGAME)
-TESTEDITOR_TARGET:=$(TESTEDITOR)
+TESTGAME_TARGET:=$(TESTGAME)$(EXESUFFIX)
+TESTEDITOR_TARGET:=$(TESTEDITOR)$(EXESUFFIX)
 
 TESTGAME_OBJS=game sound_stub common config
 TESTEDITOR_OBJS=bstub common
@@ -211,11 +211,11 @@ DUKE3D_EDITOR_LINKERFLAGS=
 
 DUKE3D_OBJ=$(DUKE3D_SRC)/$(obj)
 
-EDUKE32 ?= eduke32$(EXESUFFIX)
-MAPSTER32 ?= mapster32$(EXESUFFIX)
+EDUKE32 ?= eduke32
+MAPSTER32 ?= mapster32
 
-EDUKE32_TARGET:=$(EDUKE32)
-MAPSTER32_TARGET:=$(MAPSTER32)
+EDUKE32_TARGET:=$(EDUKE32)$(EXESUFFIX)
+MAPSTER32_TARGET:=$(MAPSTER32)$(EXESUFFIX)
 
 COMMON_OBJS=rev
 COMMON_EDITOR_OBJS=m32common m32def m32exec m32vars mathutil rev
@@ -353,18 +353,18 @@ endif
 
 all: start $(EDUKE32_TARGET) $(MAPSTER32_TARGET) finish
 ifneq (,$(EDUKE32_TARGET))
-	@ls -l $(EDUKE32)
+	@ls -l $(EDUKE32)$(EXESUFFIX)
 endif
 ifneq (,$(MAPSTER32_TARGET))
-	@ls -l $(MAPSTER32)
+	@ls -l $(MAPSTER32)$(EXESUFFIX)
 endif
 
 test: start $(TESTGAME_TARGET) $(TESTEDITOR_TARGET) finish
 ifneq (,$(TESTGAME_TARGET))
-	@ls -l $(TESTGAME)
+	@ls -l $(TESTGAME)$(EXESUFFIX)
 endif
 ifneq (,$(TESTEDITOR_TARGET))
-	@ls -l $(TESTEDITOR)
+	@ls -l $(TESTEDITOR)$(EXESUFFIX)
 endif
 
 ebacktrace: start $(EBACKTRACEDLL_TARGET) finish
@@ -387,45 +387,73 @@ dxutils: $(addsuffix $(EXESUFFIX),$(DXUTILS))
 sdlutils: $(addsuffix $(EXESUFFIX),$(SDLUTILS))
 	@ls -l $^
 
-$(TESTGAME): $(TESTGAME_OBJS_EXP) $(COMMON_OBJS_EXP) $(ENGINE_OBJS_EXP)
-	$(LINK_STATUS)
-	$(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS) $(STATICSTDCPP) $(RECIPE_RESULT_LINK)
-ifneq ($(STRIP),)
-	$(STRIP) $(TESTGAME)
+ifeq ($(PLATFORM),WII)
+ifneq ($(ELF2DOL),)
+$(TESTGAME)$(DOLSUFFIX): $(TESTGAME)$(EXESUFFIX)
+$(TESTEDITOR)$(DOLSUFFIX): $(TESTEDITOR)$(EXESUFFIX)
+$(EDUKE32)$(DOLSUFFIX): $(EDUKE32)$(EXESUFFIX)
+$(MAPSTER32)$(DOLSUFFIX): $(MAPSTER32)$(EXESUFFIX)
+endif
 endif
 
-$(TESTEDITOR): $(TESTEDITOR_OBJS_EXP) $(COMMON_EDITOR_OBJS_EXP) $(ENGINE_EDITOR_OBJS_EXP) $(ENGINE_OBJS_EXP)
+$(TESTGAME)$(EXESUFFIX): $(TESTGAME_OBJS_EXP) $(COMMON_OBJS_EXP) $(ENGINE_OBJS_EXP)
 	$(LINK_STATUS)
 	$(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS) $(STATICSTDCPP) $(RECIPE_RESULT_LINK)
+ifeq ($(PLATFORM),WII)
+ifneq ($(ELF2DOL),)
+	$(ELF2DOL) $(TESTGAME)$(EXESUFFIX) $(TESTGAME)$(DOLSUFFIX)
+endif
+endif
 ifneq ($(STRIP),)
-	$(STRIP) $(TESTEDITOR)
+	$(STRIP) $(TESTGAME)$(EXESUFFIX)
 endif
 
-$(EDUKE32): $(DUKE3D_OBJS_EXP) $(COMMON_OBJS_EXP) $(ENGINE_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(ENET_TARGET) $(DUKE3D_MISCDEPS)
+$(TESTEDITOR)$(EXESUFFIX): $(TESTEDITOR_OBJS_EXP) $(COMMON_EDITOR_OBJS_EXP) $(ENGINE_EDITOR_OBJS_EXP) $(ENGINE_OBJS_EXP)
+	$(LINK_STATUS)
+	$(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(LIBDIRS) $(LIBS) $(STATICSTDCPP) $(RECIPE_RESULT_LINK)
+ifeq ($(PLATFORM),WII)
+ifneq ($(ELF2DOL),)
+	$(ELF2DOL) $(TESTEDITOR)$(EXESUFFIX) $(TESTEDITOR)$(DOLSUFFIX)
+endif
+endif
+ifneq ($(STRIP),)
+	$(STRIP) $(TESTEDITOR)$(EXESUFFIX)
+endif
+
+$(EDUKE32)$(EXESUFFIX): $(DUKE3D_OBJS_EXP) $(COMMON_OBJS_EXP) $(ENGINE_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(ENET_TARGET) $(DUKE3D_MISCDEPS)
 	$(LINK_STATUS)
 	$(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(DUKE3D_LINKERFLAGS) $(LIBDIRS) $(LIBS) $(STATICSTDCPP) $(RECIPE_RESULT_LINK)
+ifeq ($(PLATFORM),WII)
+ifneq ($(ELF2DOL),)
+	$(ELF2DOL) $(EDUKE32)$(EXESUFFIX) $(EDUKE32)$(DOLSUFFIX)
+endif
+endif
 ifneq ($(STRIP),)
-	$(STRIP) $(EDUKE32)
+	$(STRIP) $(EDUKE32)$(EXESUFFIX)
 endif
 ifeq ($(PLATFORM),DARWIN)
 	cp -RPf "platform/Apple/bundles/EDuke32.app" "./"
 	mkdir -p "EDuke32.app/Contents/MacOS"
-	cp -f "$(EDUKE32)" "EDuke32.app/Contents/MacOS/"
+	cp -f "$(EDUKE32)$(EXESUFFIX)" "EDuke32.app/Contents/MacOS/"
 endif
 
-$(MAPSTER32): $(DUKE3D_EDITOR_OBJS_EXP) $(COMMON_EDITOR_OBJS_EXP) $(ENGINE_EDITOR_OBJS_EXP) $(ENGINE_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(DUKE3D_EDITOR_MISCDEPS)
+$(MAPSTER32)$(EXESUFFIX): $(DUKE3D_EDITOR_OBJS_EXP) $(COMMON_EDITOR_OBJS_EXP) $(ENGINE_EDITOR_OBJS_EXP) $(ENGINE_OBJS_EXP) $(AUDIOLIB_OBJS_EXP) $(DUKE3D_EDITOR_MISCDEPS)
 	$(LINK_STATUS)
 	$(RECIPE_IF) $(LINKER) -o $@ $^ $(COMMONFLAGS) $(LINKERFLAGS) $(DUKE3D_EDITOR_LINKERFLAGS) $(LIBDIRS) $(LIBS) $(STATICSTDCPP) $(RECIPE_RESULT_LINK)
+ifeq ($(PLATFORM),WII)
+ifneq ($(ELF2DOL),)
+	$(ELF2DOL) $(MAPSTER32)$(EXESUFFIX) $(MAPSTER32)$(DOLSUFFIX)
+endif
+endif
 ifneq ($(STRIP),)
-	$(STRIP) $(MAPSTER32)
+	$(STRIP) $(MAPSTER32)$(EXESUFFIX)
 endif
 ifeq ($(PLATFORM),DARWIN)
 	cp -RPf "platform/Apple/bundles/Mapster32.app" "./"
 	mkdir -p "Mapster32.app/Contents/MacOS"
-	cp -f "$(MAPSTER32)" "Mapster32.app/Contents/MacOS/"
+	cp -f "$(MAPSTER32)$(EXESUFFIX)" "Mapster32.app/Contents/MacOS/"
 endif
 
-
 include Makefile.deps
 include $(ENGINE_ROOT)/Makefile.deps
 
@@ -610,14 +638,14 @@ $(ENGINE_OBJ) $(AUDIOLIB_OBJ) $(ENET_OBJ) $(DUKE3D_OBJ) $(TESTGAME_OBJ):
 # Delete executables, object files created from sources in source/, and
 # miscellaneous generated files related to Lunatic on non-Linux.
 clean:
-	echo "rm -f $(EDUKE32) $(MAPSTER32) $(DUKE3D_OBJ)/*.o $(DUKE3D_MISCDEPS) $(DUKE3D_EDITOR_MISCDEPS)"
-	-rm -f $(EDUKE32) $(MAPSTER32) $(DUKE3D_OBJ)/*.o $(DUKE3D_MISCDEPS) $(DUKE3D_EDITOR_MISCDEPS)
+	echo "rm -f $(EDUKE32)$(EXESUFFIX) $(MAPSTER32)$(EXESUFFIX) $(DUKE3D_OBJ)/*.o $(DUKE3D_MISCDEPS) $(DUKE3D_EDITOR_MISCDEPS)"
+	-rm -f $(EDUKE32)$(EXESUFFIX) $(MAPSTER32)$(EXESUFFIX) $(DUKE3D_OBJ)/*.o $(DUKE3D_MISCDEPS) $(DUKE3D_EDITOR_MISCDEPS)
 ifeq ($(PLATFORM),DARWIN)
 	-rm -rf EDuke32.app Mapster32.app
 endif
 
 cleantest:
-	-rm -f $(TESTGAME) $(TESTEDITOR) $(TESTGAME_OBJS_EXP) $(TESTEDITOR_OBJS_EXP)
+	-rm -f $(TESTGAME)$(EXESUFFIX) $(TESTEDITOR)$(EXESUFFIX) $(TESTGAME_OBJS_EXP) $(TESTEDITOR_OBJS_EXP)
 
 cleanutils:
 	-rm -f $(addsuffix $(EXESUFFIX),$(UTILS) $(GAMEUTILS)) $(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(UTILS))) $(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(GAMEUTILS))) $(addsuffix $(EXESUFFIX),$(DXUTILS)) $(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(DXUTILS))) $(addsuffix $(EXESUFFIX),$(SDLUTILS)) $(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(SDLUTILS))) $(UTIL_OBJS_EXP)
diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index ebdb3605c..ae1dd837d 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -54,6 +54,8 @@ ifeq ($(PLATFORM),WII)
     CROSS=powerpc-eabi-
     RANLIB=powerpc-eabi-ranlib
     STRIP=powerpc-eabi-strip
+    ELF2DOL=elf2dol
+    DOLSUFFIX=.dol
 endif
 
 CLANG?=0
diff --git a/polymer/eduke32/platform/wiibuild.bat b/polymer/eduke32/platform/wiibuild.bat
index aa7e01095..a6d124e0b 100644
--- a/polymer/eduke32/platform/wiibuild.bat
+++ b/polymer/eduke32/platform/wiibuild.bat
@@ -2,7 +2,7 @@
 setlocal ENABLEEXTENSIONS DISABLEDELAYEDEXPANSION
 
 set targets=eduke32 mapster32
-set PATH=C:\devkitPro\devkitPPC\bin;C:\devkitPro\msys\bin;C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH%
+set PATH=C:\devkitPro\devkitPPC\bin;C:\MinGW\bin;C:\MinGW\msys\1.0\bin;C:\devkitPro\msys\bin;%PATH%
 set DEVKITPPC=C:/devkitPro/devkitPPC
 set DEVKITPRO=C:/devkitPro
 
@@ -25,16 +25,12 @@ set commandline=make PLATFORM=WII %* STRIP=""
 echo %commandline%
 %commandline%
 
-for %%G in (%targets%) do if not exist "%%~G.elf" goto end
-
-:: Strip:
-for %%G in (%targets%) do for %%H in (.elf) do if exist "%%~G%%~H" copy /y "%%~G%%~H" "%%~G-unstripped%%~H"
-for %%G in (%targets%) do for %%H in (.elf) do if exist "%%~G%%~H" powerpc-eabi-strip "%%~G%%~H"
+for %%G in (%targets%) do if not exist "%%~G.dol" goto end
 
 :: Package data:
 if not exist apps mkdir apps
 for %%G in (%targets%) do xcopy /e /q /y %wiidir%\apps\%%~G apps\%%~G\
-for %%G in (%targets%) do for %%H in (.elf) do if exist "%%~G%%~H" move /y "%%~G%%~H" "apps\%%~G\boot%%~H"
+for %%G in (%targets%) do for %%H in (.dol) do if exist "%%~G%%~H" move /y "%%~G%%~H" "apps\%%~G\boot%%~H"
 for %%G in (%targets%) do for %%H in (.elf.map) do if exist "%%~G%%~H" del /f /q "%%~G%%~H"
 for %%G in (%targets%) do "echo.exe" -e "    <version>r%rev%</version>\n    <release_date>%currentdate%</release_date>" | "cat.exe" "%wiidir%\%%~G_meta_1.xml" - "%wiidir%\%%~G_meta_2.xml" >"apps\%%~G\meta.xml"
 
@@ -44,6 +40,7 @@ xcopy /e /q /y /EXCLUDE:%wiidir%\xcopy_exclude.txt package\common apps\mapster32
 xcopy /e /q /y /EXCLUDE:%wiidir%\xcopy_exclude.txt package\sdk apps\mapster32\
 
 "ls.exe" -l -R apps
+7z.exe a -mx9 -t7z eduke32-wii-r%rev%-debug-elf.7z *.elf -xr!*.svn*
 7z.exe a -mx9 -t7z eduke32-wii-r%rev%.7z apps -xr!*.svn*
 
 :end