diff --git a/Core/EmulationSettings.cpp b/Core/EmulationSettings.cpp
index 5a816b17..7cace87c 100644
--- a/Core/EmulationSettings.cpp
+++ b/Core/EmulationSettings.cpp
@@ -2,10 +2,10 @@
 #include "EmulationSettings.h"
 #include "VsControlManager.h"
 
-//Version 0.5.3
+//Version 0.6.0
 uint16_t EmulationSettings::_versionMajor = 0;
-uint8_t EmulationSettings::_versionMinor = 5;
-uint8_t EmulationSettings::_versionRevision = 3;
+uint8_t EmulationSettings::_versionMinor = 6;
+uint8_t EmulationSettings::_versionRevision = 0;
 
 Language EmulationSettings::_displayLanguage = Language::English;
 
diff --git a/GUI.NET/Config/AudioInfo.cs b/GUI.NET/Config/AudioInfo.cs
index afb83639..7e101319 100644
--- a/GUI.NET/Config/AudioInfo.cs
+++ b/GUI.NET/Config/AudioInfo.cs
@@ -13,7 +13,7 @@ namespace Mesen.GUI.Config
 	{
 		public string AudioDevice = "";
 		public bool EnableAudio = true;
-		public UInt32 AudioLatency = 100;
+		public UInt32 AudioLatency = 50;
 		public UInt32 MasterVolume = 25;
 		public UInt32 Square1Volume = 100;
 		public UInt32 Square2Volume = 100;
diff --git a/GUI.NET/Config/Configuration.cs b/GUI.NET/Config/Configuration.cs
index 1e5b0cb2..32b3b0bb 100644
--- a/GUI.NET/Config/Configuration.cs
+++ b/GUI.NET/Config/Configuration.cs
@@ -13,7 +13,7 @@ namespace Mesen.GUI.Config
 		private const int MaxRecentFiles = 10;
 		private bool _needToSave = false;
 
-		public string MesenVersion = "0.5.3";
+		public string MesenVersion = "0.6.0";
 		public PreferenceInfo PreferenceInfo;
 		public AudioInfo AudioInfo;
 		public VideoInfo VideoInfo;
diff --git a/GUI.NET/Dependencies/resources.es.xml b/GUI.NET/Dependencies/resources.es.xml
index 417f62cb..6302e282 100644
--- a/GUI.NET/Dependencies/resources.es.xml
+++ b/GUI.NET/Dependencies/resources.es.xml
@@ -442,7 +442,7 @@
       <Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
       <Control ID="lblWebsite">Sitio web:</Control>
       <Control ID="lblLink">www.mesen.ca</Control>
-      <Control ID="labelVersion">Version: 0.5.3 (Beta)</Control>
+      <Control ID="labelVersion">Version: 0.6.0 (Beta)</Control>
       <Control ID="okButton">&amp;OK</Control>
     </Form>
     <Form ID="frmVsGameConfig" Title="Configuración de juego VS">
diff --git a/GUI.NET/Dependencies/resources.fr.xml b/GUI.NET/Dependencies/resources.fr.xml
index cd452ff2..2d422171 100644
--- a/GUI.NET/Dependencies/resources.fr.xml
+++ b/GUI.NET/Dependencies/resources.fr.xml
@@ -455,7 +455,7 @@
       <Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
       <Control ID="lblWebsite">Site web:</Control>
       <Control ID="lblLink">www.mesen.ca</Control>
-      <Control ID="labelVersion">Version: 0.5.3 (Beta)</Control>
+      <Control ID="labelVersion">Version: 0.6.0 (Beta)</Control>
       <Control ID="okButton">&amp;OK</Control>
     </Form>
     <Form ID="frmVsGameConfig" Title="Configuration du jeu VS">
diff --git a/GUI.NET/Dependencies/resources.ja.xml b/GUI.NET/Dependencies/resources.ja.xml
index d9721173..397e24f4 100644
--- a/GUI.NET/Dependencies/resources.ja.xml
+++ b/GUI.NET/Dependencies/resources.ja.xml
@@ -442,7 +442,7 @@
       <Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
       <Control ID="lblWebsite">サイト:</Control>
       <Control ID="lblLink">www.mesen.ca</Control>
-      <Control ID="labelVersion">バージョン: 0.5.3 (ベータ版)</Control>
+      <Control ID="labelVersion">バージョン: 0.6.0 (ベータ版)</Control>
       <Control ID="okButton">&amp;OK</Control>
     </Form>
     <Form ID="frmUpdatePrompt" Title="Mesen ー アップデート可能">
diff --git a/GUI.NET/Dependencies/resources.ru.xml b/GUI.NET/Dependencies/resources.ru.xml
index c3485c57..8fa400de 100644
--- a/GUI.NET/Dependencies/resources.ru.xml
+++ b/GUI.NET/Dependencies/resources.ru.xml
@@ -446,7 +446,7 @@
       <Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
       <Control ID="lblWebsite">Сайт:</Control>
       <Control ID="lblLink">www.mesen.ca</Control>
-      <Control ID="labelVersion">Версия: 0.5.3 (Beta)</Control>
+      <Control ID="labelVersion">Версия: 0.6.0 (Beta)</Control>
       <Control ID="okButton">&amp;OK</Control>
     </Form>
     <Form ID="frmVsGameConfig" Title="Конфигурация VS">
diff --git a/GUI.NET/Dependencies/resources.uk.xml b/GUI.NET/Dependencies/resources.uk.xml
index 35df14ab..7850eb7d 100644
--- a/GUI.NET/Dependencies/resources.uk.xml
+++ b/GUI.NET/Dependencies/resources.uk.xml
@@ -445,7 +445,7 @@
       <Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
       <Control ID="lblWebsite">Сайт:</Control>
       <Control ID="lblLink">www.mesen.ca</Control>
-      <Control ID="labelVersion">Версiя: 0.5.3 (Beta)</Control>
+      <Control ID="labelVersion">Версiя: 0.6.0 (Beta)</Control>
       <Control ID="okButton">&amp;OK</Control>
     </Form>
     <Form ID="frmVsGameConfig" Title="Конфігурація VS">
diff --git a/GUI.NET/Forms/frmAbout.Designer.cs b/GUI.NET/Forms/frmAbout.Designer.cs
index 687fb2c5..34a85db8 100644
--- a/GUI.NET/Forms/frmAbout.Designer.cs
+++ b/GUI.NET/Forms/frmAbout.Designer.cs
@@ -143,7 +143,7 @@
 			this.labelVersion.Name = "labelVersion";
 			this.labelVersion.Size = new System.Drawing.Size(146, 17);
 			this.labelVersion.TabIndex = 0;
-			this.labelVersion.Text = "Version: 0.5.3 (Beta)";
+			this.labelVersion.Text = "Version: 0.6.0 (Beta)";
 			this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
 			// 
 			// okButton
diff --git a/GUI.NET/Properties/AssemblyInfo.cs b/GUI.NET/Properties/AssemblyInfo.cs
index 691e4d53..a6a34b99 100644
--- a/GUI.NET/Properties/AssemblyInfo.cs
+++ b/GUI.NET/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.3.0")]
-[assembly: AssemblyFileVersion("0.5.3.0")]
+[assembly: AssemblyVersion("0.6.0.0")]
+[assembly: AssemblyFileVersion("0.6.0.0")]