diff --git a/DShowPlugin/DShowPlugin.rc b/DShowPlugin/DShowPlugin.rc
index b0454a45c..2ddfd24c1 100644
--- a/DShowPlugin/DShowPlugin.rc
+++ b/DShowPlugin/DShowPlugin.rc
@@ -58,8 +58,8 @@ IDC_COLORPICKER         CURSOR                  "cursor1.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,5,4,1
- PRODUCTVERSION 0,5,4,1
+ FILEVERSION 0,5,4,2
+ PRODUCTVERSION 0,5,4,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -75,12 +75,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Open Broadcaster Software DirectShow Plugin"
-            VALUE "FileVersion", "0.5.4.1"
+            VALUE "FileVersion", "0.5.4.2"
             VALUE "InternalName", "DShowPlugin.dll"
             VALUE "LegalCopyright", "Copyright (C) 2013"
             VALUE "OriginalFilename", "DShowPlugin.dll"
             VALUE "ProductName", "Open Broadcaster Software DirectShow Plugin"
-            VALUE "ProductVersion", "0.5.4.1"
+            VALUE "ProductVersion", "0.5.4.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/GraphicsCapture/GraphicsCapture.rc b/GraphicsCapture/GraphicsCapture.rc
index 591a84045..47299b93e 100644
--- a/GraphicsCapture/GraphicsCapture.rc
+++ b/GraphicsCapture/GraphicsCapture.rc
@@ -106,8 +106,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,5,4,1
- PRODUCTVERSION 0,5,4,1
+ FILEVERSION 0,5,4,2
+ PRODUCTVERSION 0,5,4,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -123,12 +123,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Open Broadcaster Software Game Capture Plugin"
-            VALUE "FileVersion", "0.5.4.1"
+            VALUE "FileVersion", "0.5.4.2"
             VALUE "InternalName", "GraphicsCapture.dll"
             VALUE "LegalCopyright", "Copyright (C) 2013"
             VALUE "OriginalFilename", "GraphicsCapture.dll"
             VALUE "ProductName", "Open Broadcaster Software Game Capture Plugin"
-            VALUE "ProductVersion", "0.5.4.1"
+            VALUE "ProductVersion", "0.5.4.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/GraphicsCapture/GraphicsCaptureHook/GraphicsCaptureHook.rc b/GraphicsCapture/GraphicsCaptureHook/GraphicsCaptureHook.rc
index 9d6f1c380..dd4739dcc 100644
--- a/GraphicsCapture/GraphicsCaptureHook/GraphicsCaptureHook.rc
+++ b/GraphicsCapture/GraphicsCaptureHook/GraphicsCaptureHook.rc
@@ -17,6 +17,7 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+#pragma code_page(932)
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -52,6 +53,7 @@ END
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -59,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,5,4,1
- PRODUCTVERSION 0,5,4,1
+ FILEVERSION 0,5,4,2
+ PRODUCTVERSION 0,5,4,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -76,12 +78,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Open Broadcaster Software Game Capture Hook"
-            VALUE "FileVersion", "0.5.4.1"
+            VALUE "FileVersion", "0.5.4.2"
             VALUE "InternalName", "GraphicsCaptureHook.dll"
             VALUE "LegalCopyright", "Copyright (C) 2013"
             VALUE "OriginalFilename", "GraphicsCaptureHook.dll"
             VALUE "ProductName", "Open Broadcaster Software Game Capture Hook"
-            VALUE "ProductVersion", "0.5.4.1"
+            VALUE "ProductVersion", "0.5.4.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/OBS.rc b/OBS.rc
index 90cbcb0c9..d16610766 100644
--- a/OBS.rc
+++ b/OBS.rc
@@ -826,8 +826,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,5,4,1
- PRODUCTVERSION 0,5,4,1
+ FILEVERSION 0,5,4,2
+ PRODUCTVERSION 0,5,4,2
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -843,12 +843,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Open Broadcaster Software"
-            VALUE "FileVersion", "0.5.4.1"
+            VALUE "FileVersion", "0.5.4.2"
             VALUE "InternalName", "OBS"
             VALUE "LegalCopyright", "Copyright (C) 2013"
             VALUE "OriginalFilename", "OBS.exe"
             VALUE "ProductName", "Open Broadcaster Software"
-            VALUE "ProductVersion", "0.5.4.1"
+            VALUE "ProductVersion", "0.5.4.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/OBSApi/OBSApi.rc b/OBSApi/OBSApi.rc
index 78ca690a3..9861d9ee5 100644
--- a/OBSApi/OBSApi.rc
+++ b/OBSApi/OBSApi.rc
@@ -17,6 +17,7 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+#pragma code_page(932)
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -50,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,5,4,1
- PRODUCTVERSION 0,5,4,1
+ FILEVERSION 0,5,4,2
+ PRODUCTVERSION 0,5,4,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -67,12 +68,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Open Broadcaster Software API Library"
-            VALUE "FileVersion", "0.5.4.1"
+            VALUE "FileVersion", "0.5.4.2"
             VALUE "InternalName", "OBSApi.dll"
             VALUE "LegalCopyright", "Copyright (C) 2013"
             VALUE "OriginalFilename", "OBSApi.dll"
             VALUE "ProductName", "Open Broadcaster Software API Library"
-            VALUE "ProductVersion", "0.5.4.1"
+            VALUE "ProductVersion", "0.5.4.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Main.h b/Source/Main.h
index 19c564690..dbf47b66c 100644
--- a/Source/Main.h
+++ b/Source/Main.h
@@ -73,10 +73,10 @@ extern bool         bIsPortable;
 extern TCHAR        lpAppPath[MAX_PATH];
 extern TCHAR        lpAppDataPath[MAX_PATH];
 
-#define OBS_VERSION             0x005401 //version number is 0xMMmmtt (Major.minor.test - yes I know it's hex)
-#define OBS_VERSION_STRING_ANSI "Open Broadcaster Software v0.541b"
+#define OBS_VERSION             0x005402 //version number is 0xMMmmtt (Major.minor.test - yes I know it's hex)
+#define OBS_VERSION_STRING_ANSI "Open Broadcaster Software v0.542b"
 #define OBS_VERSION_STRING      TEXT(OBS_VERSION_STRING_ANSI)
-#define OBS_TEST_BUILD          1 //define this if releasing a test build to disable the auto updater
+//#define OBS_TEST_BUILD          1 //define this if releasing a test build to disable the auto updater
 
 #ifdef _DEBUG
 #define OBS_DISABLE_AUTOUPDATE 1
diff --git a/installer/installer.nsi b/installer/installer.nsi
index 6c9805803..a9892c352 100644
--- a/installer/installer.nsi
+++ b/installer/installer.nsi
@@ -2,7 +2,7 @@
 
 ; Define your application name
 !define APPNAME "Open Broadcaster Software"
-!define APPNAMEANDVERSION "Open Broadcaster Software 0.541b"
+!define APPNAMEANDVERSION "Open Broadcaster Software 0.542b"
 
 ; Additional script dependencies
 !include WinVer.nsh