diff --git a/Installer/Language/czech.nsi b/Installer/Language/czech.nsi
new file mode 100644
index 000000000..4178fcb39
--- /dev/null
+++ b/Installer/Language/czech.nsi
@@ -0,0 +1,13 @@
+; Czech installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_CZECH} "mRemoteNG run CZECH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_CZECH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_CZECH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_CZECH} "mRemoteNG requires Microsoft .NET Framework 2.0."
\ No newline at end of file
diff --git a/Installer/Language/dutch.nsi b/Installer/Language/dutch.nsi
new file mode 100644
index 000000000..fbe1b3299
--- /dev/null
+++ b/Installer/Language/dutch.nsi
@@ -0,0 +1,13 @@
+; Dutch installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_DUTCH} "mRemoteNG run DUTCH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_DUTCH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_DUTCH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_DUTCH} "mRemoteNG requires Microsoft .NET Framework 2.0."
\ No newline at end of file
diff --git a/Installer/Language/english.nsi b/Installer/Language/english.nsi
new file mode 100644
index 000000000..3ed459db0
--- /dev/null
+++ b/Installer/Language/english.nsi
@@ -0,0 +1,13 @@
+; English installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_ENGLISH} "Launch mRemoteNG Now"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_ENGLISH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_ENGLISH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_ENGLISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
\ No newline at end of file
diff --git a/Installer/Language/french.nsi b/Installer/Language/french.nsi
new file mode 100644
index 000000000..9dc05ac66
--- /dev/null
+++ b/Installer/Language/french.nsi
@@ -0,0 +1,13 @@
+; French installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_FRENCH} "mRemoteNG run FRENCH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_FRENCH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_FRENCH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_FRENCH} "mRemoteNG requires Microsoft .NET Framework 2.0."
\ No newline at end of file
diff --git a/Installer/Language/german.nsi b/Installer/Language/german.nsi
new file mode 100644
index 000000000..ecb757631
--- /dev/null
+++ b/Installer/Language/german.nsi
@@ -0,0 +1,13 @@
+; German installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_GERMAN} "mRemoteNG jetzt Starten"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_GERMAN} "Installationsprogamm Sprache"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_GERMAN} "Bitte wählen Sie die Sprache für das Installationsprogramm"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_GERMAN} "mRemoteNG benötigt das Microsoft .NET Framework 2.0."
\ No newline at end of file
diff --git a/Installer/Language/languages.nsi b/Installer/Language/languages.nsi
new file mode 100644
index 000000000..b72c383ef
--- /dev/null
+++ b/Installer/Language/languages.nsi
@@ -0,0 +1,8 @@
+; Language names
+!define LanguageNameEnglish "English"
+!define LanguageNameGerman "Deutsch"
+!define LanguageNameDutch "Dutch"
+!define LanguageNameFrench "French"
+!define LanguageNamePolish "Polish"
+!define LanguageNameSpanish "Spanish"
+!define LanguageNameCzech "Czech"
\ No newline at end of file
diff --git a/Installer/Language/polish.nsi b/Installer/Language/polish.nsi
new file mode 100644
index 000000000..6cfaa89f9
--- /dev/null
+++ b/Installer/Language/polish.nsi
@@ -0,0 +1,13 @@
+; Polish installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_POLISH} "mRemoteNG run POLISH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_POLISH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_POLISH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_POLISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
\ No newline at end of file
diff --git a/Installer/Language/spanish.nsi b/Installer/Language/spanish.nsi
new file mode 100644
index 000000000..cd2ecb5ca
--- /dev/null
+++ b/Installer/Language/spanish.nsi
@@ -0,0 +1,13 @@
+; Spanish installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_SPANISH} "mRemoteNG run SPANISH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_SPANISH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_SPANISH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_SPANISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
\ No newline at end of file
diff --git a/Installer/mRemote.nsi b/Installer/mRemote.nsi
index 37586ddf1..6cf9aafbd 100644
--- a/Installer/mRemote.nsi
+++ b/Installer/mRemote.nsi
@@ -56,25 +56,56 @@ VIAddVersionKey "FileVersion" ${PRODUCT_VERSION_LONG}
 
 ; Set Language
 !insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Dutch"
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "Polish"
-!insertmacro MUI_LANGUAGE "Spanish"
-!insertmacro MUI_LANGUAGE "Czech"
+!include "Language\english.nsi"
 
-; Finish Page translations
-LangString LaunchMremoteNow ${LANG_ENGLISH} "Launch mRemoteNG Now"
-LangString LaunchMremoteNow ${LANG_GERMAN} "mRemoteNG jetzt Starten"
-LangString LaunchMremoteNow ${LANG_DUTCH} "mRemoteNG run DUTCH message"
-LangString LaunchMremoteNow ${LANG_FRENCH} "mRemoteNG run FRENCH message"
-LangString LaunchMremoteNow ${LANG_POLISH} "mRemoteNG run POLISH message"
-LangString LaunchMremoteNow ${LANG_SPANISH} "mRemoteNG run SPANISH message"
-LangString LaunchMremoteNow ${LANG_CZECH} "mRemoteNG run CZECH message"
+!insertmacro MUI_LANGUAGE "German"
+!include "Language\german.nsi"
+
+!insertmacro MUI_LANGUAGE "Dutch"
+!include "Language\dutch.nsi"
+
+!insertmacro MUI_LANGUAGE "French"
+!include "Language\french.nsi"
+
+!insertmacro MUI_LANGUAGE "Polish"
+!include "Language\polish.nsi"
+
+!insertmacro MUI_LANGUAGE "Spanish"
+!include "Language\spanish.nsi"
+
+!insertmacro MUI_LANGUAGE "Czech"
+!include "Language\czech.nsi"
 
 !define MUI_FINISHPAGE_RUN_Text "$(LaunchMremoteNow)"
 
+; Language names
+!include "Language\languages.nsi"
+
 Function .onInit
+	;Language selection dialog
+	Push ""
+	Push ${LANG_ENGLISH}
+	Push ${LanguageNameEnglish}
+	Push ${LANG_GERMAN}
+	Push ${LanguageNameGerman}
+	Push ${LANG_DUTCH}
+	Push ${LanguageNameDutch}
+	Push ${LANG_FRENCH}
+	Push ${LanguageNameFrench}
+	Push ${LANG_POLISH}
+	Push ${LanguageNamePolish}
+	Push ${LANG_SPANISH}
+	Push ${LanguageNameSpanish}
+	Push ${LANG_CZECH}
+	Push ${LanguageNameCzech}
+	Push A ; A means auto count languages
+	       ; for the auto count to work the first empty push (Push "") must remain
+	LangDLL::LangDialog  "$(InstallerLanguage)" "$(SelectInstallerLanguage)"
+
+	Pop $LANGUAGE
+	StrCmp $LANGUAGE "cancel" 0 +2
+		Abort
+
 	; Check .NET version
 	StrCpy $InstallDotNET "No"
 	Call GetDotNETVersion
@@ -92,7 +123,7 @@ Function .onInit
 	${EndIf}
 
 	${If} $InstallDotNET == "Yes"
-		MessageBox MB_OK|MB_ICONEXCLAMATION "mRemoteNG requires Microsoft .NET Framework 2.0."
+		MessageBox MB_OK|MB_ICONEXCLAMATION "$(RequiresNetFramework)"
 		Quit
 	${EndIf}
 FunctionEnd