diff --git a/miss/miss.cpp b/miss/miss.cpp
index ab0feab..d843c01 100644
--- a/miss/miss.cpp
+++ b/miss/miss.cpp
@@ -11,6 +11,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include "..\version.h"
+
 #pragma comment(lib, "miniupnpc.lib")
 #pragma comment(lib, "libnatpmp.lib")
 #pragma comment(lib, "ws2_32.lib")
@@ -548,6 +550,9 @@ void ResetLogFile()
 
     // Redirect stdout to this new file
     freopen(currentLogFilePath, "w", stdout);
+
+    // Print a log header
+    printf("Moonlight Internet Streaming Service v" VER_VERSION_STR NL);
 }
 
 DWORD WINAPI GameStreamStateChangeThread(PVOID Context)
diff --git a/miss/miss.rc b/miss/miss.rc
index 10e3406..99bd5a0 100644
--- a/miss/miss.rc
+++ b/miss/miss.rc
@@ -2,7 +2,7 @@
 #include "../version.h"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION     VER_FILEVERSION
+FILEVERSION     VER_VERSION
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
@@ -10,7 +10,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",        VER_COMPANYNAME_STR
             VALUE "FileDescription",    "Moonlight Internet Streaming Service"
-            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "ProductName",        VER_PRODUCTNAME_STR
         END
     END
 
diff --git a/mist/mist.cpp b/mist/mist.cpp
index 26bce3f..2e86dc9 100644
--- a/mist/mist.cpp
+++ b/mist/mist.cpp
@@ -12,6 +12,8 @@
 #include <shellapi.h>
 #include <objbase.h>
 
+#include "..\version.h"
+
 #pragma comment(lib, "miniupnpc.lib")
 #pragma comment(lib, "libnatpmp.lib")
 #pragma comment(lib, "ws2_32.lib")
@@ -713,6 +715,12 @@ int main(int argc, char* argv[])
     snprintf(logFilePath, sizeof(logFilePath), "%s\\%s", tempPath, "mis-test.log");
     freopen(logFilePath, "w", stdout);
 
+    // Print a log header
+    printf("Moonlight Internet Streaming Tester v" VER_VERSION_STR "\n");
+
+    // Print a console header
+    fprintf(stderr, "Moonlight Internet Streaming Tester v" VER_VERSION_STR "\n\n");
+
     int err = WSAStartup(MAKEWORD(2, 2), &wsaData);
     if (err != NO_ERROR) {
         DisplayMessage("Unable to initialize WinSock");
diff --git a/mist/mist.rc b/mist/mist.rc
index e386053..9028ec4 100644
--- a/mist/mist.rc
+++ b/mist/mist.rc
@@ -2,7 +2,7 @@
 #include "../version.h"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION     VER_FILEVERSION
+FILEVERSION     VER_VERSION
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
@@ -10,7 +10,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",        VER_COMPANYNAME_STR
             VALUE "FileDescription",    "Moonlight Internet Streaming Tester"
-            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "ProductName",        VER_PRODUCTNAME_STR
         END
     END
 
diff --git a/version.h b/version.h
index 89dbe11..12170dd 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#define VER_VERSION                 1,2,0,0
+#define VER_VERSION_STR             "1.2.0.0"
+
 #define VER_COMPANYNAME_STR         "Moonlight Game Streaming Project"
-#define VER_FILEVERSION             1,2,0,0
-#define VER_FILEVERSION_STR         "1.2.0.0\0"
+#define VER_PRODUCTNAME_STR         "Moonlight Internet Streaming Helper"