diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml
index 73d4dda87c..4bdec2f235 100644
--- a/config/alfresco/action-services-context.xml
+++ b/config/alfresco/action-services-context.xml
@@ -151,6 +151,10 @@
       <property name="enumClassName" value="org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation" />
    </bean>
    
+   <bean id="ac-content-properties" class="org.alfresco.repo.action.constraint.EnumParameterConstraint" parent="action-constraint">
+      <property name="enumClassName" value="org.alfresco.repo.action.evaluator.compare.ContentPropertyName" />
+   </bean>
+   
    <bean id="ac-mimetypes" class="org.alfresco.repo.action.constraint.MimetypeParameterConstraint" parent="action-constraint">      
     	<property name="mimetypeMap" ref="mimetypeService"/>
    </bean>
diff --git a/config/alfresco/messages/action-config.properties b/config/alfresco/messages/action-config.properties
index 26268c39c0..c9856be9fa 100644
--- a/config/alfresco/messages/action-config.properties
+++ b/config/alfresco/messages/action-config.properties
@@ -8,6 +8,10 @@ ac-compare-operations.greater_than_equal=Greater Than Or Equal To
 ac-compare-operations.less_than=Less Than
 ac-compare-operations.less_than_equal=Less Than Or Equal To
 
+ac-content-properties.mime_type=Mimetype
+ac-content-properties.encoding=Encoding
+ac-content-properties.size=Size
+
 # Action conditions
 
 no-condition.title=All Items
diff --git a/source/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluator.java b/source/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluator.java
index 69a5e20ee9..17f8ae060c 100644
--- a/source/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluator.java
+++ b/source/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluator.java
@@ -160,7 +160,7 @@ public class ComparePropertyValueEvaluator extends ActionConditionEvaluatorAbstr
     protected void addParameterDefinitions(List<ParameterDefinition> paramList) 
     {
         paramList.add(new ParameterDefinitionImpl(PARAM_PROPERTY, DataTypeDefinition.QNAME, false, getParamDisplayLabel(PARAM_PROPERTY)));
-        paramList.add(new ParameterDefinitionImpl(PARAM_CONTENT_PROPERTY, DataTypeDefinition.TEXT, false, getParamDisplayLabel(PARAM_CONTENT_PROPERTY)));
+        paramList.add(new ParameterDefinitionImpl(PARAM_CONTENT_PROPERTY, DataTypeDefinition.TEXT, false, getParamDisplayLabel(PARAM_CONTENT_PROPERTY), false, "ac-content-properties"));
         paramList.add(new ParameterDefinitionImpl(PARAM_VALUE, DataTypeDefinition.ANY, true, getParamDisplayLabel(PARAM_VALUE)));
         paramList.add(new ParameterDefinitionImpl(PARAM_OPERATION, DataTypeDefinition.TEXT, false, getParamDisplayLabel(PARAM_OPERATION), false, "ac-compare-operations"));
     }