diff --git a/hbc/meta.xml b/hbc/meta.xml
index 357e38a..da06f35 100644
--- a/hbc/meta.xml
+++ b/hbc/meta.xml
@@ -2,8 +2,8 @@
 <app version="1">
   <name>Visual Boy Advance GX</name>
   <coder>Tantric</coder>
-  <version>2.1.1</version>
-  <release_date>20091207</release_date>
+  <version>2.1.2</version>
+  <release_date>20091223</release_date>
   <short_description>GBA/GBC/GB Emulator</short_description>
   <long_description>A port of Visual Boy Advance - M to the Wii.</long_description>
 </app>
diff --git a/readme.txt b/readme.txt
index 0109c18..35e1c03 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
 ¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤
  
                             - Visual Boy Advance GX -
-                                  Version 2.1.1
+                                  Version 2.1.2
                          http://code.google.com/p/vba-wii   
                                (Under GPL License)
  
@@ -28,6 +28,14 @@ With it you can play GBA/Game Boy Color/Game Boy games on your Wii/GameCube.
 |0O×øo·                         UPDATE HISTORY                        ·oø×O0|
 `¨•¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨'
 
+[2.1.2 - December 23, 2009]
+
+* Numerous core optimizations (thanks dancinninjac!)
+* File browser now scrolls down to the last game when returning to browser
+* Auto update for those using USB now works
+* Fixed scrollbar up/down buttons
+* Minor optimizations
+
 [2.1.1 - December 7, 2009]
 
 * Save state corruption issues fixed
diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp
index 4286490..fd93246 100644
--- a/source/ngc/menu.cpp
+++ b/source/ngc/menu.cpp
@@ -3510,7 +3510,8 @@ static int MenuSettingsNetwork()
 		if(ret >= 0 || firstRun)
 		{
 			firstRun = false;
-			strncpy (options.value[0], GCSettings.smbip, 15);
+			strncpy (options.value[0], GCSettings.smbip, 25);
+			options.value[0][25] = 0;
 			strncpy (options.value[1], GCSettings.smbshare, 19);
 			strncpy (options.value[2], GCSettings.smbuser, 19);
 			strncpy (options.value[3], GCSettings.smbpwd, 19);
diff --git a/source/ngc/vba.h b/source/ngc/vba.h
index b149c9a..20d7fc1 100644
--- a/source/ngc/vba.h
+++ b/source/ngc/vba.h
@@ -16,7 +16,7 @@
 #include "filelist.h"
 
 #define APPNAME 		"Visual Boy Advance GX"
-#define APPVERSION 		"2.1.1"
+#define APPVERSION 		"2.1.2"
 #define APPFOLDER 		"vbagx"
 #define PREF_FILE_NAME 	"settings.xml"
 #define PAL_FILE_NAME 	"palettes.xml"
@@ -52,7 +52,7 @@ struct SGCSettings{
 	char	SaveFolder[MAXPATHLEN]; // Path to save files
 	char	CheatFolder[MAXPATHLEN]; // Path to cheat files
 
-	char	smbip[16];
+	char	smbip[80];
 	char	smbuser[20];
 	char	smbpwd[20];
 	char	smbshare[20];
diff --git a/update.xml b/update.xml
index bbfd2f6..11c16ed 100644
--- a/update.xml
+++ b/update.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<app version="2.1.1">
-<file url="http://vba-wii.googlecode.com/files/Visual%20Boy%20Advance%20GX%202.1.1%20-%20Wii.zip"></file>
+<app version="2.1.2">
+<file url="http://vba-wii.googlecode.com/files/Visual%20Boy%20Advance%20GX%202.1.2%20-%20Wii.zip"></file>
 </app>