diff -urN filezilla-3.2.6.1/src/interface/Mainfrm.cpp filezilla-3.2.6.1.orig/src/interface/Mainfrm.cpp
--- filezilla-3.2.6.1/src/interface/Mainfrm.cpp	2009-07-19 00:06:04.000000000 +0900
+++ filezilla-3.2.6.1.orig/src/interface/Mainfrm.cpp	2009-07-02 07:12:42.000000000 +0900
@@ -2727,7 +2727,6 @@
 
 		CServer server;
 		CServerPath path;
-
 		if (!server.ParseUrl(param, 0, _T(""), _T(""), error, path))
 		{
 			wxString str = _("Parameter not a valid URL");
@@ -2735,12 +2734,6 @@
 			wxMessageBox(error, _("Syntax error in command line"));
 		}
 
-		wxString encoding;
-		if ((encoding = pCommandLine->GetOption(CCommandLine::encoding)) != _T(""))
-		{
-			server.SetEncodingType(ENCODING_CUSTOM, encoding);
-		}
-
 		m_pState->Connect(server, true, path);
 	}
 }
diff -urN filezilla-3.2.6.1/src/interface/Options.cpp filezilla-3.2.6.1.orig/src/interface/Options.cpp
--- filezilla-3.2.6.1/src/interface/Options.cpp	2009-07-19 00:06:04.000000000 +0900
+++ filezilla-3.2.6.1.orig/src/interface/Options.cpp	2009-07-02 07:12:42.000000000 +0900
@@ -77,7 +77,7 @@
 	{ "Last Server Path", string, _T("") },
 	{ "Concurrent download limit", number, _T("0") },
 	{ "Concurrent upload limit", number, _T("0") },
-	{ "Update Check", number, _T("0") },
+	{ "Update Check", number, _T("1") },
 	{ "Update Check Interval", number, _T("7") },
 	{ "Last automatic update check", string, _T("") },
 	{ "Update Check New Version", string, _T("") },
diff -urN filezilla-3.2.6.1/src/interface/cmdline.cpp filezilla-3.2.6.1.orig/src/interface/cmdline.cpp
--- filezilla-3.2.6.1/src/interface/cmdline.cpp	2009-07-19 00:06:04.000000000 +0900
+++ filezilla-3.2.6.1.orig/src/interface/cmdline.cpp	2009-07-02 07:12:42.000000000 +0900
@@ -5,7 +5,6 @@
 {
 	m_parser.AddSwitch(_T("h"), _T("help"), _("Shows this help dialog"), wxCMD_LINE_OPTION_HELP);
 	m_parser.AddSwitch(_T("s"), _T("site-manager"), _("Start with opened Site Manager"));
-	m_parser.AddOption(_T("e"), _T("encoding"), _("Connect to selected Encoding"));
 	m_parser.AddOption(_T("c"), _T("site"), _("Connect to specified Site Manager site"));
 #ifdef __WXMSW__
 	m_parser.AddSwitch(_T(""), _T("close"), _("Close all running instances of FileZilla"));
@@ -45,10 +44,6 @@
 		if (m_parser.Found(_T("c"), &value))
 			return value;
 		break;
-	case encoding:
-		if (m_parser.Found(_T("e"), &value))
-			return value;
-		break;
 	}
 
 	return _T("");
diff -urN filezilla-3.2.6.1/src/interface/cmdline.h filezilla-3.2.6.1.orig/src/interface/cmdline.h
--- filezilla-3.2.6.1/src/interface/cmdline.h	2009-07-19 00:06:04.000000000 +0900
+++ filezilla-3.2.6.1.orig/src/interface/cmdline.h	2009-07-02 07:12:46.000000000 +0900
@@ -15,8 +15,7 @@
 
 	enum t_option
 	{
-		site,
-		encoding
+		site
 	};
 
 	CCommandLine(int argc, wxChar** argv);