diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 4cc5ca36c2..fa8bd303d8 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -649,8 +649,15 @@
 
 #undef wxUSE_MS_HTML_HELP
 #define wxUSE_MS_HTML_HELP 0
+
 #endif // __GNUWIN32__
 
+// Cygwin b20 doesn't have wcslen
+#if defined(__GNUWIN32__) && !defined(__MINGW32__)
+#undef wxUSE_WCHAR_T
+#define wxUSE_WCHAR_T 0
+#endif
+
 // MFC duplicates these operators
 #if wxUSE_MFC
 #undef  wxUSE_GLOBAL_MEMORY_OPERATORS
diff --git a/include/wx/version.h b/include/wx/version.h
index facf7d4af8..d71a41e5e3 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -15,7 +15,7 @@
 // Bump-up with each new version
 #define wxMAJOR_VERSION    2
 #define wxMINOR_VERSION    2
-#define wxRELEASE_NUMBER   2
+#define wxRELEASE_NUMBER   0
 #define wxVERSION_STRING   _T("wxWindows 2.2.0")
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
 #define wxBETA_NUMBER      0