diff --git a/config/alfresco/model/contentModel.xml b/config/alfresco/model/contentModel.xml
index 135c036bb9..4d20eb0223 100644
--- a/config/alfresco/model/contentModel.xml
+++ b/config/alfresco/model/contentModel.xml
@@ -184,16 +184,44 @@
             </property>
             <property name="cm:presenceUsername">
             	<type>d:text</type>
-            </property>
-            
+            </property>
+            <property name="cm:organization">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:jobtitle">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:location">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:persondescription">
+            	<type>d:text</type>
+            </property>
+            
+            <!-- system maintained values -->
             <property name="cm:sizeCurrent">
                 <type>d:long</type>
             </property>
             <property name="cm:sizeQuota">
                 <type>d:long</type>
             </property>
-            
          </properties>
+         
+         <associations>
+            <association name="cm:avatar">
+               <source>
+                  <role>cm:avatarOf</role>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>cm:content</class>
+                  <role>cm:hasAvatar</role>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </target>
+            </association>
+         </associations>
       </type>
 
       <!-- Classification -->
diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java
index ad88e13643..1f3b210efa 100644
--- a/source/java/org/alfresco/model/ContentModel.java
+++ b/source/java/org/alfresco/model/ContentModel.java
@@ -167,10 +167,16 @@ public interface ContentModel
     static final QName PROP_DEFAULT_HOME_FOLDER_PATH = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "defaultHomeFolderPath");
     static final QName PROP_PRESENCEPROVIDER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "presenceProvider");
     static final QName PROP_PRESENCEUSERNAME = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "presenceUsername");
+    static final QName PROP_ORGANIZATION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "organization");
+    static final QName PROP_JOBTITLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "jobtitle");
+    static final QName PROP_LOCATION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "location");
+    static final QName PROP_PERSONDESC = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "persondescription");
     
     static final QName PROP_SIZE_CURRENT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "sizeCurrent");
     static final QName PROP_SIZE_QUOTA = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "sizeQuota");
     
+    static final QName ASSOC_AVATAR = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "avatar");
+    
     // Ownable aspect  
     static final QName ASPECT_OWNABLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "ownable");
     static final QName PROP_OWNER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "owner");