diff --git a/docs/changes.txt b/docs/changes.txt
index e4125b5563..b856507fe8 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -110,6 +110,10 @@ wxMSW:
   wxPendingEventsLocker was being deleted in App before all wxEvtHandler
   objects have been destroyed resulting in stale handler/lock
   ptrs; fixed
+- Windows XP manifest is now included in wx.rc; it is no longer neccessary
+  to ship .exe.manifest file with applications to support XP themes
+- wxLocale::Init no longer reports error if trying to set Unicode-only locale
+  or if user's default locale is Unicode-only 
 
 wxMotif:
 
diff --git a/include/wx/msw/wx.manifest b/include/wx/msw/wx.manifest
new file mode 100644
index 0000000000..ecce6f5c3b
--- /dev/null
+++ b/include/wx/msw/wx.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="0.64.1.0"
+    processorArchitecture="x86"
+    name="Controls"
+    type="win32"
+/>
+<description>wxWindows application</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index e99ea3d244..fa299cbc13 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -105,3 +105,9 @@ csquery                 BITMAP "wx/msw/csquery.bmp"
 // For obtaining the RGB values of standard colours
 wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 
+//////////////////////////////////////////////////////////////////////////////
+//
+// Manifest file for Windows XP
+//
+
+1 24 "wx/msw/wx.manifest"