diff --git a/polymer/eduke32/Wii/apps/mapster32/icon.png b/polymer/eduke32/Wii/apps/mapster32/icon.png
new file mode 100644
index 000000000..fa26c0905
Binary files /dev/null and b/polymer/eduke32/Wii/apps/mapster32/icon.png differ
diff --git a/polymer/eduke32/Wii/meta_1.xml b/polymer/eduke32/Wii/eduke32_meta_1.xml
similarity index 100%
rename from polymer/eduke32/Wii/meta_1.xml
rename to polymer/eduke32/Wii/eduke32_meta_1.xml
diff --git a/polymer/eduke32/Wii/meta_2.xml b/polymer/eduke32/Wii/eduke32_meta_2.xml
similarity index 100%
rename from polymer/eduke32/Wii/meta_2.xml
rename to polymer/eduke32/Wii/eduke32_meta_2.xml
diff --git a/polymer/eduke32/Wii/mapster32_meta_1.xml b/polymer/eduke32/Wii/mapster32_meta_1.xml
new file mode 100644
index 000000000..8c8fa06af
--- /dev/null
+++ b/polymer/eduke32/Wii/mapster32_meta_1.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<app version="1">
+    <name>Mapster32 Wii</name>
+    <coder>EDuke32 Team</coder>
diff --git a/polymer/eduke32/Wii/mapster32_meta_2.xml b/polymer/eduke32/Wii/mapster32_meta_2.xml
new file mode 100644
index 000000000..0e7fed0d1
--- /dev/null
+++ b/polymer/eduke32/Wii/mapster32_meta_2.xml
@@ -0,0 +1,6 @@
+    <short_description>BUILD Editor</short_description>
+    <long_description>Mapster32 is the level editor for EDuke32 and the BUILD Engine, featuring additional editing capabilities and scripting extensions for homebrew developers and mod creators. Mapster32 is completely free, open source software. Mapster32 is licensed under the GNU GPL and the BUILD license. http://eduke32.com/</long_description>
+    <arguments>
+        <arg></arg>
+    </arguments>
+</app>
diff --git a/polymer/eduke32/Wii/xcopy_exclude.txt b/polymer/eduke32/Wii/xcopy_exclude.txt
new file mode 100644
index 000000000..f3cb13e43
--- /dev/null
+++ b/polymer/eduke32/Wii/xcopy_exclude.txt
@@ -0,0 +1 @@
+.dll
\ No newline at end of file
diff --git a/polymer/eduke32/psd/wii-hbc-icon.xcf b/polymer/eduke32/psd/wii-hbc-icon.xcf
index d31eabcfc..7dc3df63b 100644
Binary files a/polymer/eduke32/psd/wii-hbc-icon.xcf and b/polymer/eduke32/psd/wii-hbc-icon.xcf differ
diff --git a/polymer/eduke32/wiibuild.bat b/polymer/eduke32/wiibuild.bat
index 7e2d1e7f4..b3b404590 100644
--- a/polymer/eduke32/wiibuild.bat
+++ b/polymer/eduke32/wiibuild.bat
@@ -1,6 +1,7 @@
 @echo off
 setlocal ENABLEEXTENSIONS DISABLEDELAYEDEXPANSION
 
+set targets=eduke32
 set PATH=C:\devkitPro\devkitPPC\bin;C:\devkitPro\msys\bin;C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH%
 
 :: Detect versioning systems and pull the revision number:
@@ -21,19 +22,23 @@ set buildparameters=PLATFORM=WII %*
 make veryclean %buildparameters%
 make OPTLEVEL=2 LTO=0 %buildparameters%
 
-if not exist "eduke32.elf" goto end
+for %%G in (%targets%) do if not exist "%%~G.elf" goto end
 
 :: Package data:
-xcopy /e /q /y Wii\apps apps\
-for %%G in (eduke32) do for %%H in (.elf) do if exist "%%~G%%~H" move /y "%%~G%%~H" "apps\%%~G\boot%%~H"
-for %%G in (eduke32) do for %%H in (.elf.map) do if exist "%%~G%%~H" del /f /q "%%~G%%~H"
-"echo.exe" -e "    <version>%rev%</version>\n    <release_date>%currentdate%</release_date>" | "cat.exe" Wii\meta_1.xml - Wii\meta_2.xml >"apps\eduke32\meta.xml"
+if not exist apps mkdir apps
+for %%G in (%targets%) do xcopy /e /q /y Wii\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 (.elf.map) do if exist "%%~G%%~H" del /f /q "%%~G%%~H"
+for %%G in (%targets%) do "echo.exe" -e "    <version>%rev%</version>\n    <release_date>%currentdate%</release_date>" | "cat.exe" "Wii\%%~G_meta_1.xml" - "Wii\%%~G_meta_2.xml" >"apps\%%~G\meta.xml"
+
 :: We don't want to package all the stuff, most of it is for Mapster32 and dev materials.
-:: xcopy /e /q /y /EXCLUDE:.dll package apps\eduke32\
 :: However, do throw in the licenses:
 if exist "package\*.txt" copy /y "package\*.txt" "apps\eduke32\"
+
+:: xcopy /e /q /y /EXCLUDE:Wii\xcopy_exclude.txt package apps\mapster32\
+
 "ls.exe" -l -R apps
-7z.exe a -mx9 -t7z eduke32-wii-r%rev%.7z apps -xr!*.svn*
+7z.exe a -mx9 -t7z eduke32-wii-%rev%.7z apps -xr!*.svn*
 
 :end
 
@@ -42,3 +47,4 @@ if "%vc%"=="svn" svn revert source\rev.h
 if "%vc%"=="git" git checkout source\rev.h
 
 endlocal
+goto :eof