diff --git a/docs/changes.txt b/docs/changes.txt
index 3f1e6c3aca..d6417dfcea 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -115,6 +115,7 @@ wxMSW:
 - Added msw.font.no-proof-quality system option, see manual for description.
 - Fix appearance of notebook with non-top tabs under Windows Vista.
 - Fixed bug with symbol resolving in wxStackWalker (Axel Gembe).
+- Fixed showing busy cursor for disabled windows and during wxExecute()
 
 wxGTK:
 
@@ -139,6 +140,10 @@ wxMac:
 - Fixed ability of non-native/installed toolbars to have controls,
   in native toolbar compilation mode.
 
+wxMotif:
+
+- Fix crash when using wxStaticBox with empty label
+
 
 2.8.4
 -----
diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index ae4838acdc..c25efcae0e 100644
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -94,6 +94,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
                         wxDefaultValidator, name ) )
         return false;
 
+    m_labelWidget = (WXWidget) 0;
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = XtVaCreateManagedWidget ("staticboxframe",