--- a/ApplicationDefinition.st	Sun Apr 03 19:41:36 2016 +0200
+++ b/ApplicationDefinition.st	Mon Apr 04 21:43:11 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -2703,6 +2705,13 @@
 '; $','Header','$
 ; Script generated by ProjectDefinition.
 
+;
+; SETUP_NAME is either setup or setup64
+;
+!!if "${SETUP_NAME}" == ""
+SETUP_NAME="%(PRODUCT_FILENAME)Setup"
+!!endif
+
 !!define PRODUCT_NAME "%(PRODUCT_NAME)"
 !!define PRODUCT_FILENAME "%(PRODUCT_FILENAME)"
 !!define PRODUCT_VERSION "%(PRODUCT_VERSION)"
@@ -2774,7 +2783,7 @@
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "%(LEGAL_COPYRIGHT)"
 
 
-OutFile "%(PRODUCT_FILENAME)Setup.exe"
+OutFile "${SETUP_NAME}.exe"
 InstallDir "%(PRODUCT_INSTALLDIR)"
 ShowInstDetails show
 ShowUnInstDetails show
@@ -2849,7 +2858,7 @@
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 SectionEnd
 
-LangString appOpen ${LANG_GERMAN}  "Mit %(PRODUCT_NAME) öffnen"
+LangString appOpen ${LANG_GERMAN}  "Mit %(PRODUCT_NAME) öffnen"
 LangString appOpen ${LANG_ENGLISH} "Open with %(PRODUCT_NAME)"
 
 LangString DESC_Section1 ${LANG_ENGLISH} "Program components of %(PRODUCT_NAME)"
@@ -2883,7 +2892,7 @@
 
 Function un.onInit
 !!insertmacro MUI_UNGETLANGUAGE
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie %(PRODUCT_NAME) und alle seine Komponenten deinstallieren?" IDYES +2
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie %(PRODUCT_NAME) und alle seine Komponenten deinstallieren?" IDYES +2
   Abort
 FunctionEnd