--- ./hw/xwin/save_XWin.rc	2014-12-09 09:54:57.912659517 +0000
+++ ./hw/xwin/XWin.rc	2016-02-07 14:33:41.410705417 +0000
@@ -31,27 +31,75 @@
 
 #include <windows.h>
 #include "winresource.h"
-#include "xwin-config.h"
-#include "version-config.h"
+
+#ifndef __CYGWIN__
+
+#include <winver.h>
+
+#include "../../../version.def"
+#define XW32_VERSIONINFO_NAME "Xming\0"
+#define XW32_VERSIONINFO_COMMENT "Xming X Server\0"
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION    XW32_VERSION
+  PRODUCTVERSION XW32_VERSION
+  FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
+  FILEFLAGS      0
+  FILEOS         VOS__WINDOWS32
+  FILETYPE       VFT_APP
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080904b0"
+        BEGIN
+            VALUE "FileDescription", XW32_VERSIONINFO_COMMENT
+            VALUE "ProductName", "Xming - X Server for Windows\0"
+            VALUE "ProductVersion", XW32_VERSION_STRING
+            VALUE "FileVersion", XW32_VERSION_STRING
+            VALUE "InternalName", XW32_VERSIONINFO_NAME
+            VALUE "OriginalFilename", "Xming.exe\0"
+            VALUE "CompanyName", "Colin Harrison\0"
+            VALUE "LegalCopyright", "Copyright \251 2005-2024 Colin Harrison\0"
+            VALUE "Info", "http://www.StraightRunning.com/XmingNotes/\0"
+            VALUE "Comment", XW32_VERSIONINFO_COMMENT
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x809, 1200
+    END
+END
+#endif
 
 /*
  * Dialogs
  */
 
 /* About */
-ABOUT_BOX DIALOGEX 32, 32, 260, 105
+ABOUT_BOX DIALOGEX 32, 32, 180, 110
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP  | DS_CENTERMOUSE
 CAPTION "About " XVENDORNAMESHORT
 FONT 8, "MS Shell Dlg 2"
 BEGIN
-  CONTROL				IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32
-  LTEXT			XVENDORNAMESHORT " X Server ", IDC_STATIC, 36, 8, 220, 8
-  LTEXT			VENDOR_MAN_VERSION, IDC_STATIC, 36, 18, 220, 8
-  LTEXT			BUILDERSTRING, IDC_STATIC, 36, 28, 220, 8
-  LTEXT			"This software is licensed under the terms of the MIT/X11 License.", IDC_STATIC, 36, 48, 220, 20
-  CONTROL               __VENDORDWEBSUPPORT__, ID_ABOUT_WEBSITE, "Button",
-                        BS_OWNERDRAW | WS_TABSTOP, 36, 68, 220, 8
-  DEFPUSHBUTTON		"&OK", IDOK, 105, 85, 50, 15
+  RTEXT			"Xming ", IDC_STATIC, 65, 5, 25, 15
+  LTEXT			XW32_VERSION_STRING, IDC_STATIC, 90, 5, 30, 15
+  CTEXT			"\251 2005-2024 Colin Harrison", IDC_STATIC, 45, 20, 100, 15
+  CONTROL		IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 152, 6, 48, 48
+  GROUPBOX		"&Website Links", IDC_STATIC, 5, 30, 170, 56
+  CONTROL		"X &Server", ID_ABOUT_WEBSITE, "Button",
+			BS_OWNERDRAW | WS_TABSTOP | WS_GROUP, 20, 45, 40, 15
+  CONTROL		"&Fonts", ID_ABOUT_FONTS, "Button",
+			BS_OWNERDRAW | WS_TABSTOP, 77, 45, 40, 15
+  CONTROL		"&Changes", ID_ABOUT_RELEASES, "Button",
+			BS_OWNERDRAW | WS_TABSTOP, 134, 45, 40, 15
+  CONTROL		"&Manual", ID_ABOUT_UG, "Button",
+			BS_OWNERDRAW | WS_TABSTOP, 20, 65, 40, 15
+  CONTROL		"&Xmingrc", ID_ABOUT_XMINGRC, "Button",
+			BS_OWNERDRAW | WS_TABSTOP, 77, 65, 40, 15
+  CONTROL		"&Trouble?", ID_ABOUT_FAQ, "Button",
+			BS_OWNERDRAW | WS_TABSTOP, 134, 65, 40, 15
+  PUSHBUTTON		"View &Agreement", ID_ABOUT_AGREEMENT, 30, 91, 60, 15, WS_TABSTOP | WS_GROUP
+  DEFPUSHBUTTON		"&OK", IDOK, 120, 91, 30, 15, WS_TABSTOP
 END
 
 
@@ -78,9 +126,10 @@
 BEGIN
   PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14
   DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14
-  CTEXT "E&xiting will close all screens running on this display.", IDC_STATIC, 7, 12, 166, 8
-  CTEXT "No information about connected clients available.", IDC_CLIENTS_CONNECTED, 7, 24, 166, 8
-  CTEXT "Proceed with shutdown of this display/server?", IDC_STATIC, 7, 36, 166, 8
+  CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 152, 6, 48, 48
+  LTEXT "E&xit will close everything on this server.", IDC_STATIC, 14, 12, 138, 8
+  LTEXT "No information about connected clients available.", IDC_CLIENTS_CONNECTED, 14, 24, 138, 8
+  LTEXT "Proceed with shutdown of this server's display?", IDC_STATIC, 14, 36, 166, 8
 END
 
 
@@ -93,10 +142,10 @@
 	POPUP "TRAYICON_MENU"
 	BEGIN
 		MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT
-		MENUITEM "Clipboard may use &PRIMARY selection", ID_APP_MONITOR_PRIMARY
-		MENUITEM "&About...", ID_APP_ABOUT
+		MENUITEM "X11 &PRIMARY Selection", ID_APP_MONITOR_PRIMARY
+		MENUITEM "&About Xming", ID_APP_ABOUT
 		MENUITEM SEPARATOR
-		MENUITEM "E&xit...", ID_APP_EXIT
+		MENUITEM "E&xit", ID_APP_EXIT
 	END
 END
 
@@ -106,4 +155,4 @@
  */
 
 IDI_XWIN		ICON	"X.ico"
-CREATEPROCESS_MANIFEST_RESOURCE_ID	RT_MANIFEST	"XWin.exe.manifest"
+CREATEPROCESS_MANIFEST_RESOURCE_ID	RT_MANIFEST	"Xming.exe.manifest"