diff --git a/Frameworks/Core/ERExtensions/Components/ERXRadioButtonMatrix.api b/Frameworks/Core/ERExtensions/Components/ERXRadioButtonMatrix.api
index 4e07225166b..df6f7536469 100644
--- a/Frameworks/Core/ERExtensions/Components/ERXRadioButtonMatrix.api
+++ b/Frameworks/Core/ERExtensions/Components/ERXRadioButtonMatrix.api
@@ -26,6 +26,6 @@
 		<validation message="'item' must be bound to a settable value">
 			<unsettable name="item"/>
 		</validation>
-    <binding name="disabled"/>
+    <binding defaults="Boolean" name="disabled"/>
     </wo>
 </wodefinitions>
diff --git a/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.html b/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.html
index f37c3aa92d9..bd1b5fa1ca4 100644
--- a/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.html
+++ b/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.html
@@ -1 +1 @@
-<webobject name=RadioButtonRepetition><table border=0 cellpadding=0 cellspacing=0 class="ERXMatrixTable"><tr><td><webobject name=RadioButton></webobject></td><td class="ERXMatrixTableCell"><webobject name=Content></webobject></td></tr></table></webobject>
\ No newline at end of file
+<webobject name=RadioButtonRepetition><table border=0 cellpadding=0 cellspacing=0 class="ERXMatrixTable"><tr><td><wo:if condition="$disabled"><webobject name="RadioButtonDisabled"/></wo:if><wo:else><webobject name="RadioButton"/></wo:else></td><td class="ERXMatrixTableCell"><webobject name=Content></webobject></td></tr></table></webobject>
\ No newline at end of file
diff --git a/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.wod b/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.wod
index 9266efc7551..2d0947ed793 100644
--- a/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.wod
+++ b/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXRadioButtonMatrix.wo/ERXRadioButtonMatrix.wod
@@ -9,6 +9,15 @@ RadioButton: WOGenericElement {
 	value = index;
 }
 
+RadioButtonDisabled: WOGenericElement {
+    elementName = "input";
+    name = uniqueID;
+    otherTagString = isCurrentItemSelected;
+    type = "radio";
+    value = index;
+    disabled = true;
+}
+
 RadioButtonRepetition: ERXTable {
 	cellpadding = cellpadding;
 	cellspacing = cellspacing;
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXRadioButtonMatrix.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXRadioButtonMatrix.java
index c1e9c2aee9e..0da70404267 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXRadioButtonMatrix.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXRadioButtonMatrix.java
@@ -67,6 +67,10 @@ public void setCurrentItem(Object aValue) {
     public Number index() {
         return index;
     }
+    
+    public boolean disabled() {
+    	return booleanValueForBinding("disabled", false);
+    }
 
     public void setIndex(Number newIndex) {
         index = newIndex;
@@ -107,10 +111,6 @@ public String otherTagStringForRadioButton() {
         	return (isDisabled ? "disabled" : "") + (isDisabled && isChecked? " " : "") + (isChecked ? "checked" : "");
 	}
 
-    public boolean disabled() {
-    	return booleanValueForBinding("disabled", false);
-    }
-
     @Override
     public void awake() {
         super.awake();
diff --git a/Frameworks/Core/JavaWOExtensions/Components/Nonlocalized.lproj/WOCheckboxMatrix.wo/WOCheckboxMatrix.html b/Frameworks/Core/JavaWOExtensions/Components/Nonlocalized.lproj/WOCheckboxMatrix.wo/WOCheckboxMatrix.html
index d2edfe884c4..987b3f0b3c7 100644
--- a/Frameworks/Core/JavaWOExtensions/Components/Nonlocalized.lproj/WOCheckboxMatrix.wo/WOCheckboxMatrix.html
+++ b/Frameworks/Core/JavaWOExtensions/Components/Nonlocalized.lproj/WOCheckboxMatrix.wo/WOCheckboxMatrix.html
@@ -1,5 +1,5 @@
 <webobject name=CheckBoxWrapper>
     <webobject name=CheckBoxRepetition>
-    <table border=0 cellpadding=0 cellspacing=0><tr><td><webobject name=CheckBox></webobject></td><td><webobject name=Content></webobject></td></tr></table>
+    <table border=0 cellpadding=0 cellspacing=0><tr><td><webobject name = "isDisabledConditional"><webobject name="disabledCheckBox"></webobject></webobject><webobject name = "isEnabledConditional"><webobject name="CheckBox"></webobject></webobject></td><td><webobject name=Content></webobject></td></tr></table>
     </webobject>
 </webobject>
diff --git a/Frameworks/Core/JavaWOExtensions/Components/Nonlocalized.lproj/WOCheckboxMatrix.wo/WOCheckboxMatrix.wod b/Frameworks/Core/JavaWOExtensions/Components/Nonlocalized.lproj/WOCheckboxMatrix.wo/WOCheckboxMatrix.wod
index 814fe32a61c..9bbfe9e1d6c 100644
--- a/Frameworks/Core/JavaWOExtensions/Components/Nonlocalized.lproj/WOCheckboxMatrix.wo/WOCheckboxMatrix.wod
+++ b/Frameworks/Core/JavaWOExtensions/Components/Nonlocalized.lproj/WOCheckboxMatrix.wo/WOCheckboxMatrix.wod
@@ -1,4 +1,12 @@
- 
+isDisabledConditional : WOConditional {
+	condition = ^disabled;
+}
+
+isEnabledConditional : WOConditional {
+	condition = ^disabled;
+	negate = true;
+}
+
 CheckBox: WOGenericElement {
 	elementName = "input";
 	name = wrapperElementID;
@@ -7,6 +15,15 @@ CheckBox: WOGenericElement {
 	value = index;
 }
 
+disabledCheckBox: WOGenericElement {
+	elementName = "input";
+	name = wrapperElementID;
+	otherTagString = isCurrentItemChecked;
+	type = "checkbox";
+	value = index;
+	disabled = "disabled";
+}
+
 CheckBoxRepetition: WOTable {
 	cellpadding = 0;
 	cellspacing = 0;
diff --git a/Frameworks/Core/JavaWOExtensions/Components/WOCheckboxMatrix.api b/Frameworks/Core/JavaWOExtensions/Components/WOCheckboxMatrix.api
index 3f5b77fb336..52eaee1440c 100644
--- a/Frameworks/Core/JavaWOExtensions/Components/WOCheckboxMatrix.api
+++ b/Frameworks/Core/JavaWOExtensions/Components/WOCheckboxMatrix.api
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <wodefinitions>
 	<wo class="WOCheckboxMatrix" wocomponentcontent="true">
                 <image path="WOCheckboxMatrix.tiff"/>
@@ -15,5 +15,6 @@
 		<validation message="'item' is a required binding">
 			<unbound name="item"/>
 		</validation>
-	</wo>
-</wodefinitions>
\ No newline at end of file
+	<binding name="disabled"/>
+    </wo>
+</wodefinitions>