4 files changed, 40 insertions, 12 deletions
diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi
index ec065fcd7..358384095 100644
--- a/xorg-server/installer/vcxsrv-64-debug.nsi
+++ b/xorg-server/installer/vcxsrv-64-debug.nsi
@@ -17,11 +17,14 @@
 */
 ;--------------------------------
 
+!define NAME_STRING "VcXsrv (X2Go/Arctica Builds)"
+!define VERSION "1.15.2.5"
+
 ; The name of the installer
-Name "VcXsrv (X2Go/Arctica Builds)"
+Name "${NAME_STRING}"
 
 ; The file to write
-OutFile "vcxsrv-64-debug.1.15.2.5.x2go+arctica.installer.exe"
+OutFile "vcxsrv-64-debug.${VERSION}.x2go+arctica.installer.exe"
 
 ; The default installation directory
 InstallDir $PROGRAMFILES64\VcXsrv
diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi
index 975c8174d..27e281c6f 100644
--- a/xorg-server/installer/vcxsrv-64.nsi
+++ b/xorg-server/installer/vcxsrv-64.nsi
@@ -17,11 +17,16 @@
 */
 ;--------------------------------
 
+!define NAME_STRING "VcXsrv (X2Go/Arctica Builds)"
+!define VERSION "1.15.2.5"
+!define UNINSTALL_PUBLISHER "X2Go & Arctica Projects"
+!define UNINSTALL_URL "https://github.com/ArcticaProject/vcxsrv"
+
 ; The name of the installer
-Name "VcXsrv (X2Go/Arctica Builds)"
+Name "${NAME_STRING}"
 
 ; The file to write
-OutFile "vcxsrv-64.1.15.2.5.x2go+arctica.installer.exe"
+OutFile "vcxsrv-64.${VERSION}.x2go+arctica.installer.exe"
 
 ; The default installation directory
 InstallDir $programfiles64\VcXsrv
@@ -123,8 +128,14 @@ Section "VcXsrv (required)"
   WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir_64" $INSTDIR
 
   ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayName" "VcXsrv"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayIcon" "$INSTDIR\vcxsrv.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayName" "${NAME_STRING}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayVersion" "${VERSION}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "Publisher" "${UNINSTALL_PUBLISHER}}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "UninstallString" "$INSTDIR\uninstall.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "HelpLink"         "${UNINSTALL_URL}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "URLInfoAbout"     "${UNINSTALL_URL}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "URLUpdateInfo"    "${UNINSTALL_URL}"
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoModify" 1
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoRepair" 1
   WriteUninstaller "uninstall.exe"
diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi
index 928018359..08ef13e31 100644
--- a/xorg-server/installer/vcxsrv-debug.nsi
+++ b/xorg-server/installer/vcxsrv-debug.nsi
@@ -17,11 +17,14 @@
 */
 ;--------------------------------
 
+!define NAME_STRING "VcXsrv (X2Go/Arctica Builds)"
+!define VERSION "1.15.2.5"
+
 ; The name of the installer
-Name "VcXsrv (X2Go/Arctica Builds)"
+Name "${NAME_STRING}"
 
 ; The file to write
-OutFile "vcxsrv-debug.1.15.2.5.x2go+arctica.installer.exe"
+OutFile "vcxsrv-debug.${VERSION}.x2go+arctica.installer.exe"
 
 ; The default installation directory
 InstallDir $PROGRAMFILES32\VcXsrv
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index 8ee07ca54..b948a11af 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -17,11 +17,16 @@
 */
 ;--------------------------------
 
+!define NAME_STRING "VcXsrv (X2Go/Arctica Builds)"
+!define VERSION "1.15.2.5"
+!define UNINSTALL_PUBLISHER "X2Go & Arctica Projects"
+!define UNINSTALL_URL "https://github.com/ArcticaProject/vcxsrv"
+
 ; The name of the installer
-Name "VcXsrv (X2Go/Arctica Builds)"
+Name "${NAME_STRING}"
 
 ; The file to write
-OutFile "vcxsrv.1.15.2.5.x2go+arctica.installer.exe"
+OutFile "vcxsrv.${VERSION}.x2go+arctica.installer.exe"
 
 ; The default installation directory
 InstallDir $PROGRAMFILES32\VcXsrv
@@ -123,8 +128,14 @@ Section "VcXsrv (required)"
   WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir" "$INSTDIR"
 
   ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayName" "VcXsrv"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayIcon" "$INSTDIR\vcxsrv.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayName" "${NAME_STRING}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayVersion" "${VERSION}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "Publisher" "${UNINSTALL_PUBLISHER}}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "UninstallString" "$INSTDIR\uninstall.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "HelpLink"         "${UNINSTALL_URL}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "URLInfoAbout"     "${UNINSTALL_URL}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "URLUpdateInfo"    "${UNINSTALL_URL}"
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoModify" 1
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoRepair" 1
   WriteUninstaller "uninstall.exe"