diff --git a/docs/changes.txt b/docs/changes.txt
index 5de9bcef8b..7128686cf0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -80,11 +80,6 @@ Changes in behaviour not resulting in compilation errors, please read this!
 - Default location of wxFileConfig files has changed under Windows, you will
   need to update your code if you access these files directly.
 
-- Return value of wxStandardPaths::GetUserDataDir() and similar functions has
-  changed if the vendor name is defined as it now includes it by default under
-  Windows and OS X. Call wxStandardPaths::UseAppInfo(AppInfo_AppName) to
-  revert to behaviour compatible with 2.8 version.
-
 - wxWindow::IsEnabled() now returns false if a window parent (and not
   necessarily the window itself) is disabled, new function IsThisEnabled()
   with the same behaviour as old IsEnabled() was added.
@@ -385,6 +380,14 @@ Major new features in this release
 2.9.1:
 ------
 
+INCOMPATIBLE CHANGE SINCE 2.9.0
+
+- wxStandardPaths doesn't use vendor name by default under MSW and OSX to
+  remain compatible with 2.8 behaviour but this makes it incompatible with
+  2.9.0. Please use UseAppInfo(AppInfo_AppName | AppInfo_VendorName) explicitly
+  to use the vendor name in the paths returned by wxStandardPaths.
+
+
 All:
 
 - Added wxStd{Input,Output}Stream classes (Jonathan Liu).
diff --git a/interface/wx/stdpaths.h b/interface/wx/stdpaths.h
index d443cd773c..88c37c870b 100644
--- a/interface/wx/stdpaths.h
+++ b/interface/wx/stdpaths.h
@@ -22,8 +22,8 @@
     Notice that in the examples below the string @c appinfo may be either just
     the application name (as returned by wxApp::GetAppName()) or a combination
     of the vendor name (wxApp::GetVendorName()) and the application name, with
-    a path separator between them. By default, the vendor name is used under
-    Windows and OS X but not under other Unix systems, see UseAppInfo().
+    a path separator between them. By default, only the application name is
+    used, use UseAppInfo() to change this.
 
     The other placeholders should be self-explanatory: the string @c username
     should be replaced with the value the name of the currently logged in user.
@@ -336,8 +336,7 @@ public:
             used combined with AppInfo_AppName, i.e. as @code AppInfo_AppName |
             AppInfo_VendorName @endcode
 
-        By default, only the application name is used under Unix systems but both
-        application and vendor names are used under Windows and Mac.
+        By default, only the application name is used.
 
         @since 2.9.0
     */
diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 3667c1e954..42b9fa9b7e 100644
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -333,9 +333,6 @@ wxString wxStandardPaths::MSWGetShellDir(int csidl)
 
 wxStandardPaths::wxStandardPaths()
 {
-    // under MSW it's common to use both the applicatio nand vendor
-    UseAppInfo(AppInfo_AppName | AppInfo_VendorName);
-
     // make it possible to run uninstalled application from the build directory
     IgnoreAppBuildSubDirs();
 }
diff --git a/src/osx/core/stdpaths_cf.cpp b/src/osx/core/stdpaths_cf.cpp
index 8a1cee42a5..df8a8db610 100644
--- a/src/osx/core/stdpaths_cf.cpp
+++ b/src/osx/core/stdpaths_cf.cpp
@@ -49,14 +49,12 @@ wxStandardPathsCF::wxStandardPathsCF()
                  : m_bundle(CFBundleGetMainBundle())
 {
     CFRetain(m_bundle);
-    UseAppInfo(AppInfo_AppName | AppInfo_VendorName);
 }
 
 wxStandardPathsCF::wxStandardPathsCF(wxCFBundleRef bundle)
                  : m_bundle(bundle)
 {
     CFRetain(m_bundle);
-    UseAppInfo(AppInfo_AppName | AppInfo_VendorName);
 }
 
 wxStandardPathsCF::~wxStandardPathsCF()