diff --git a/docs/changes.txt b/docs/changes.txt
index 211a858bbc..787221dba5 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -88,6 +88,13 @@ Major new features in 2.8 release
   wxSearchCtrl, wxAboutBox, wxTreebook, tar streams.
 
 
+2.8.11:
+-------
+
+All (GUI):
+
+- Add wxBU_EXACTFIT support to wxToggleButton XRC handler (Ronny Krueger).
+
 2.8.10:
 -------
 
diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 91f433d8a9..c5f0b559e7 100644
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -23,8 +23,10 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButtonXmlHandler, wxXmlResourceHandler)
 
 wxToggleButtonXmlHandler::wxToggleButtonXmlHandler()
-: wxXmlResourceHandler()
+    : wxXmlResourceHandler()
 {
+    XRC_ADD_STYLE(wxBU_EXACTFIT);
+
     AddWindowStyles();
 }