diff --git a/extra/build_everything.cmd b/extra/build_everything.cmd
index 05bc6950..5a067b63 100644
--- a/extra/build_everything.cmd
+++ b/extra/build_everything.cmd
@@ -150,6 +150,11 @@ brcc32 ..\..\res\updater.rc
 "%compiler%" %params% -e"%base_dir%\out" heidisql.dpr
 if not %errorlevel% == 0 goto end
 
+rem Patch executable with .mo files
+rem Must be done before madExcept writes a new crc header, otherwise it will complain about a corrupt .exe
+rem See http://tech.dir.groups.yahoo.com/group/dxgettext/message/3623
+..\..\extra\dxgettext_assemble.exe "%base_dir%\out\heidisql.exe" --dxgettext
+
 rem Patch executable with exception handler
 "%mad_dir%\madExcept\Tools\madExceptPatch.exe" "%base_dir%\out\heidisql.exe" heidisql.mes
 
diff --git a/extra/dxgettext_assemble.exe b/extra/dxgettext_assemble.exe
new file mode 100644
index 00000000..da42037c
Binary files /dev/null and b/extra/dxgettext_assemble.exe differ
diff --git a/res/translation/default.po b/out/locale/en/LC_MESSAGES/default.po
similarity index 100%
rename from res/translation/default.po
rename to out/locale/en/LC_MESSAGES/default.po