diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp
index cdf615ef4..0e7adb8ef 100644
--- a/src/c_cmds.cpp
+++ b/src/c_cmds.cpp
@@ -441,27 +441,33 @@ CCMD (exec)
 	}
 }
 
+void execLogfile(const char *fn)
+{
+	if ((Logfile = fopen(fn, "w")))
+	{
+		const char *timestr = myasctime();
+		Printf("Log started: %s\n", timestr);
+	}
+	else
+	{
+		Printf("Could not start log\n");
+	}
+}
+
 CCMD (logfile)
 {
-	const char *timestr = myasctime ();
 
 	if (Logfile)
 	{
-		Printf ("Log stopped: %s\n", timestr);
+		const char *timestr = myasctime();
+		Printf("Log stopped: %s\n", timestr);
 		fclose (Logfile);
 		Logfile = NULL;
 	}
 
 	if (argv.argc() >= 2)
 	{
-		if ( (Logfile = fopen (argv[1], "w")) )
-		{
-			Printf ("Log started: %s\n", timestr);
-		}
-		else
-		{
-			Printf ("Could not start log\n");
-		}
+		execLogfile(argv[1]);
 	}
 }
 
diff --git a/src/c_dispatch.h b/src/c_dispatch.h
index 96dc50644..f4518608d 100644
--- a/src/c_dispatch.h
+++ b/src/c_dispatch.h
@@ -168,4 +168,6 @@ extern unsigned int MakeKey (const char *s);
 extern unsigned int MakeKey (const char *s, size_t len);
 extern unsigned int SuperFastHash (const char *data, size_t len);
 
+void execLogfile(const char *fn);
+
 #endif //__C_DISPATCH_H__
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 6c938ef53..695e7e517 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -2223,6 +2223,13 @@ void D_DoomMain (void)
 	FString *args;
 	int argcount;
 
+	// +logfile gets checked too late to catch the full startup log in the logfile so do some extra check for it here.
+	FString logfile = Args->TakeValue("+logfile");
+	if (logfile != NULL)
+	{
+		execLogfile(logfile);
+	}
+
 	D_DoomInit();
 	PClass::StaticInit ();
 	atterm(FinalGC);
diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp
index a82cb65f9..4690c253d 100644
--- a/src/win32/i_system.cpp
+++ b/src/win32/i_system.cpp
@@ -581,6 +581,18 @@ void I_DetectOS(void)
 					osname = "Server 2008 R2";
 				}
 			}
+			else if (info.dwMinorVersion == 2)	
+			{
+				// Microsoft broke this API for 8.1 so without jumping through hoops it won't be possible anymore to detect never versions aside from the build number, especially for older compilers.
+				if (info.wProductType == VER_NT_WORKSTATION)
+				{
+					osname = "8 (or higher)";
+				}
+				else
+				{
+					osname = "Server 2012 (or higher)";
+				}
+			}
 		}
 		break;