diff --git a/docs/changes.txt b/docs/changes.txt
index 039b789784..eb0f8f27a1 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -76,6 +76,7 @@ All (GUI):
 - Added SetSheetStyle to wxPropertySheetDialog and allowed it to
   behave like a Mac OS X settings dialog.
 - wxDC::BeginDrawing() and wxDC::EndDrawing() deprecated.
+- Added <disabled> XRC tag for wxToolBar elements
 
 wxMSW:
 
diff --git a/docs/tech/tn0014.txt b/docs/tech/tn0014.txt
index ad482a4f9e..6260226d17 100644
--- a/docs/tech/tn0014.txt
+++ b/docs/tech/tn0014.txt
@@ -457,6 +457,7 @@ appear within wxToolBar node. Their attributes are as follows:
     bitmap2                Bitmap                  wxNullBitmap
     toggle                 Boolean                 0
     radio                  Boolean                 0
+    disabled               Boolean                 0
     label                  I18nString              ""
     tooltip                I18nString              ""
     longhelp               I18nString              ""
diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 785d4d9dee..ba53f016f0 100644
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -76,6 +76,9 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
                                kind,
                                GetText(wxT("tooltip")),
                                GetText(wxT("longhelp")));
+
+            if ( GetBool(wxT("disabled")) )
+                m_toolbar->EnableTool(GetID(), false);
         }
         return m_toolbar; // must return non-NULL
     }