diff --git a/.gitattributes b/.gitattributes
index 8de15e1762a..d9e4e1f92d3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7222,6 +7222,7 @@ src/mess/mess.lst svneol=native#text/plain
 src/mess/mess.mak svneol=native#text/plain
 src/mess/messcore.mak svneol=native#text/plain
 src/mess/osd/windows/mess.ico -text
+src/mess/osd/windows/mess.man svneol=CRLF#text/plain eol=crlf
 src/mess/osd/windows/mess.rc svneol=native#text/plain
 src/mess/osd/windows/windows.mak svneol=native#text/plain
 src/mess/tiny.lst svneol=native#text/plain
diff --git a/src/build/verinfo.c b/src/build/verinfo.c
index 3b3e1ac9b84..7afc00bf23a 100644
--- a/src/build/verinfo.c
+++ b/src/build/verinfo.c
@@ -16,9 +16,8 @@
 typedef unsigned char UINT8;
 
 #define ARRAY_LENGTH(x)		(sizeof(x) / sizeof(x[0]))
-#define BUILD_WINDOWS		(0)
-#define BUILD_WINUI			(1)
-#define BUILD_MESS			(2)
+#define BUILD_MAME		(0)
+#define BUILD_MESS			(1)
 
 //============================================================
 //  TYPE DEFINITIONS
@@ -192,7 +191,7 @@ int main(int argc, char *argv[])
 	FILE *f;
 
 	memset(&v, 0, sizeof(v));
-	build = BUILD_WINDOWS;
+	build = BUILD_MAME;
 
 	// validate parameters
 	opt = 1;
@@ -201,10 +200,8 @@ int main(int argc, char *argv[])
 		if (!strcmp(argv[opt], "-b"))
 		{
 			char *p = argv[++opt];
-			if (!strcmp(p,"windows"))
-				build = BUILD_WINDOWS;
-			else if (!strcmp(p,"winui"))
-				build = BUILD_WINUI;
+			if (!strcmp(p,"mame"))
+				build = BUILD_MAME;
 			else if (!strcmp(p,"mess"))
 				build = BUILD_MESS;
 			else
@@ -266,17 +263,6 @@ int main(int argc, char *argv[])
 		v.original_filename = "MESS";
 		v.product_name = "MESS";
 	}
-	else if (build == BUILD_WINUI)
-	{
-		// MAMEUI
-		v.author = "Christopher Kirmse and the MAMEUI team";
-		v.comments = "Multiple Arcade Machine Emulator with GUI";
-		v.company_name = "MAME Team";
-		v.file_description = "Multiple Arcade Machine Emulator with GUI";
-		v.internal_name = "MAMEUI";
-		v.original_filename = "MAMEUI";
-		v.product_name = "MAMEUI";
-	}
 	else
 	{
 		// MAME
diff --git a/src/mess/osd/windows/mess.man b/src/mess/osd/windows/mess.man
new file mode 100644
index 00000000000..926637826c3
--- /dev/null
+++ b/src/mess/osd/windows/mess.man
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+	<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="MESS" type="win32" />
+	<description>Multi Emulator Super System</description>
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/>
+		</dependentAssembly>
+	</dependency>
+</assembly>
diff --git a/src/mess/osd/windows/mess.rc b/src/mess/osd/windows/mess.rc
index 5ebeb4075b1..7592dd7040a 100644
--- a/src/mess/osd/windows/mess.rc
+++ b/src/mess/osd/windows/mess.rc
@@ -1,6 +1,6 @@
 //============================================================
 //
-//	mame.rc - Minimal resource file for Win32 MAME
+//	mess.rc - Minimal resource file for Win32 MAME
 //
 //============================================================
 //
@@ -44,6 +44,6 @@
 #include "commctrl.h"
 #include "mamevers.rc"
 
-1                       24      MOVEABLE PURE   "mame.man"
+1                       24      MOVEABLE PURE   "mess.man"
 
 2                       ICON    DISCARDABLE     "mess.ico"
diff --git a/src/mess/osd/windows/windows.mak b/src/mess/osd/windows/windows.mak
index ec06594c6c4..e3c0a4a3f50 100644
--- a/src/mess/osd/windows/windows.mak
+++ b/src/mess/osd/windows/windows.mak
@@ -21,8 +21,6 @@ $(LIBOCORE): $(OSDCOREOBJS)
 
 $(LIBOCORE_NOMAIN): $(OSDCOREOBJS:$(WINOBJ)/main.o=)
 
-$(RESFILE): $(MESS_WINSRC)/mess.rc $(WINOBJ)/mamevers.rc
-
 #-------------------------------------------------
 # generic rules for the resource compiler
 #-------------------------------------------------
@@ -30,3 +28,14 @@ $(RESFILE): $(MESS_WINSRC)/mess.rc $(WINOBJ)/mamevers.rc
 $(MESS_WINOBJ)/%.res: $(MESS_WINSRC)/%.rc
 	@echo Compiling resources $<...
 	$(RC) $(RCDEFS) $(RCFLAGS) --include-dir mess/$(OSD) -o $@ -i $<
+
+	
+#-------------------------------------------------
+# rules for resource file
+#-------------------------------------------------
+
+$(RESFILE): $(MESS_WINSRC)/mess.rc $(WINOBJ)/messvers.rc
+
+$(WINOBJ)/messvers.rc: $(BUILDOUT)/verinfo$(BUILD_EXE) $(SRC)/version.c
+	@echo Emitting $@...
+	@"$(BUILDOUT)/verinfo$(BUILD_EXE)" -b mess $(SRC)/version.c > $@
\ No newline at end of file
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index 5e0c56205c5..4df12bad70e 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -377,4 +377,4 @@ $(RESFILE): $(WINSRC)/mame.rc $(WINOBJ)/mamevers.rc
 
 $(WINOBJ)/mamevers.rc: $(BUILDOUT)/verinfo$(BUILD_EXE) $(SRC)/version.c
 	@echo Emitting $@...
-	@"$(BUILDOUT)/verinfo$(BUILD_EXE)" -b windows $(SRC)/version.c > $@
+	@"$(BUILDOUT)/verinfo$(BUILD_EXE)" -b mame $(SRC)/version.c > $@