diff --git a/config/alfresco/messages/forum-model.properties b/config/alfresco/messages/forum-model.properties
index 36109047af..ef6ffa43e1 100644
--- a/config/alfresco/messages/forum-model.properties
+++ b/config/alfresco/messages/forum-model.properties
@@ -2,18 +2,20 @@
 
 fm_forummodel.description=Forum Model
 
-fm_forummodel.type.fm_forums.title=Forums
+fm_forummodel.type.fm_forums.title=Forum Space
+fm_forummodel.type.fm_forums.description=Space containing forums
 
 fm_forummodel.type.fm_forum.title=Forum
-fm_forummodel.property.fm_status.title=Forum Status
-fm_forummodel.property.fm_status.description=Status of forum i.e. locked, read-only
+fm_forummodel.type.fm_forum.description=Space containing topics
 
 fm_forummodel.type.fm_topic.title=Topic
-fm_forummodel.property.fm_type.title=Topic Type
-fm_forummodel.property.fm_type.description=Type of topic i.e. sticky, announcement etc.
+fm_forummodel.type.fm_topic.description=Space containing forum articles (posts)
 
 fm_forummodel.type.fm_post.title=Forum Article
+fm_forummodel.type.fm_post.description=Forum article posted to a topic
 
 fm_forummodel.aspect.fm_discussable.title=Discussable
-fm_forummodel.property.fm_forum.title=Forum
-fm_forummodel.property.fm_forum.description=The forum holding the discussion on the object the aspect is applied to
+fm_forummodel.aspect.fm_discussable.description=Allows an object to be discussed
+
+fm_forummodel.association.fm_discussion.title=Discussion
+fm_forummodel.association.fm_discussion.description=The forum holding the discussion on the object the aspect is applied to
diff --git a/config/alfresco/model/forumModel.xml b/config/alfresco/model/forumModel.xml
index 64ac81ff2d..900605d32d 100644
--- a/config/alfresco/model/forumModel.xml
+++ b/config/alfresco/model/forumModel.xml
@@ -25,20 +25,10 @@
       
       <type name="fm:forum">
          <parent>cm:folder</parent>
-         <properties>
-            <property name="fm:status">
-               <type>d:category</type>
-            </property>
-         </properties>
       </type>
       
       <type name="fm:topic">
          <parent>cm:folder</parent>
-         <properties>
-            <property name="fm:type">
-               <type>d:category</type>
-            </property>
-         </properties>
       </type>
       
       <type name="fm:post">
@@ -48,12 +38,20 @@
     
     <aspects>
       <aspect name="fm:discussable">
-         <properties>
-            <property name="fm:forum">
-               <type>d:noderef</type>
-               <mandatory>true</mandatory>
-            </property>
-         </properties>
+         <associations>
+            <child-association name="fm:discussion">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>fm:forum</class>
+                  <mandatory>true</mandatory>
+                  <many>false</many>
+               </target>
+               <duplicate>false</duplicate>
+            </child-association>
+         </associations>
       </aspect>
    </aspects>
    
diff --git a/source/java/org/alfresco/model/ForumModel.java b/source/java/org/alfresco/model/ForumModel.java
index 0c0b838a51..9aa6db3e8a 100644
--- a/source/java/org/alfresco/model/ForumModel.java
+++ b/source/java/org/alfresco/model/ForumModel.java
@@ -38,6 +38,5 @@ public interface ForumModel
 
     static final QName ASPECT_DISCUSSABLE = QName.createQName(FORUMS_MODEL_URI, "discussable");
     
-    static final QName PROP_STATUS = QName.createQName(FORUMS_MODEL_URI, "status");
-    static final QName PROP_TYPE = QName.createQName(FORUMS_MODEL_URI, "type");
+    static final QName ASSOC_DISCUSSION = QName.createQName(FORUMS_MODEL_URI, "discussion");
 }