diff --git a/ccm-cms-types-department/application.xml b/ccm-cms-types-department/application.xml
new file mode 100644
index 000000000..6f7f197ef
--- /dev/null
+++ b/ccm-cms-types-department/application.xml
@@ -0,0 +1,24 @@
+<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
+  name="ccm-cms-types-department"
+  prettyName="OpenCCM Content Types"
+  version="6.6.0"
+  release="1"
+  webapp="ROOT">
+  <ccm:dependencies>
+    <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-cms-types-organization"/>
+  </ccm:dependencies>
+  <ccm:directories>
+    <ccm:directory name="pdl"/>
+    <ccm:directory name="sql"/>
+    <ccm:directory name="src"/>
+  </ccm:directories>
+  <ccm:contacts>
+    <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
+    <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
+  </ccm:contacts>
+  <ccm:description>
+    The Department Content Type for OpenCCM.
+  </ccm:description>
+</ccm:application>
diff --git a/ccm-cms-types-department/pdl/com/arsdigita/content-types/Department.pdl b/ccm-cms-types-department/pdl/com/arsdigita/content-types/Department.pdl
new file mode 100644
index 000000000..0a5866bed
--- /dev/null
+++ b/ccm-cms-types-department/pdl/com/arsdigita/content-types/Department.pdl
@@ -0,0 +1,8 @@
+model com.arsdigita.cms.contenttypes;
+
+import com.arsdigita.kernel.ACSObject;
+import com.arsdigita.cms.*;
+
+object type Department extends Organization {
+    reference key ( ct_departments.department_id );
+}
diff --git a/ccm-cms-types-department/sql/ccm-cms-types-department/postgres-create.sql b/ccm-cms-types-department/sql/ccm-cms-types-department/postgres-create.sql
new file mode 100644
index 000000000..a733590e2
--- /dev/null
+++ b/ccm-cms-types-department/sql/ccm-cms-types-department/postgres-create.sql
@@ -0,0 +1,3 @@
+begin;
+\i ddl/postgres/create.sql
+end;
\ No newline at end of file
diff --git a/ccm-cms-types-department/web/static/content-types/com/arsdigita/cms/contenttypes/Department.xsl b/ccm-cms-types-department/web/static/content-types/com/arsdigita/cms/contenttypes/Department.xsl
new file mode 100644
index 000000000..8bfd527aa
--- /dev/null
+++ b/ccm-cms-types-department/web/static/content-types/com/arsdigita/cms/contenttypes/Department.xsl
@@ -0,0 +1,19 @@
+<!DOCTYPE stylesheet [
+<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
+]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:cms="http://www.arsdigita.com/cms/1.0"
+                version="1.0">
+
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Department']" mode="cms:CT_graphics"
+    name="cms:CT_graphics_com_arsdigita_cms_contenttypes_Department">
+    <p><xsl:value-of select="./name"/></p>
+  </xsl:template>
+
+<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Department']" mode="cms:CT_text"
+    name="cms:CT_text_com_arsdigita_cms_contenttypes_Department">
+    <p><xsl:value-of select="./name"/></p>
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
index fcf87207f..ca1a3cce8 100644
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/Organization.java
@@ -1,10 +1,8 @@
 package com.arsdigita.cms.contenttypes;
 
-import com.arsdigita.cms.ContentType;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
-import com.arsdigita.util.Assert;
 import java.math.BigDecimal;
 
 /**
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationChildrenPropertiesStep.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationChildrenPropertiesStep.java
index e1f73e301..d77e977d4 100644
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationChildrenPropertiesStep.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationChildrenPropertiesStep.java
@@ -5,7 +5,6 @@
 package com.arsdigita.cms.contenttypes.ui;
 
 import com.arsdigita.cms.ItemSelectionModel;
-import com.arsdigita.cms.contenttypes.Organization;
 import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
 import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
 import com.arsdigita.cms.ui.authoring.BasicItemForm;
@@ -43,7 +42,7 @@ public class OrganizationChildrenPropertiesStep extends SimpleEditStep {
             addChildSheet.getSaveCancelSection().getCancelButton());
 
         GenericOrganizationalUnitChildTable childrenTable = new GenericOrganizationalUnitChildTable(
-                (itemModel));
+                itemModel);
         setDisplayComponent(childrenTable);
     }
 }
\ No newline at end of file
diff --git a/ccm-cms-types-organization/web/static/content-types/com/arsdigita/cms/contenttypes/Organization.xsl b/ccm-cms-types-organization/web/static/content-types/com/arsdigita/cms/contenttypes/Organization.xsl
index 282b76080..af043b95b 100644
--- a/ccm-cms-types-organization/web/static/content-types/com/arsdigita/cms/contenttypes/Organization.xsl
+++ b/ccm-cms-types-organization/web/static/content-types/com/arsdigita/cms/contenttypes/Organization.xsl
@@ -8,12 +8,12 @@
 
   <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']" mode="cms:CT_graphics"
     name="cms:CT_graphics_com_arsdigita_cms_contenttypes_Organization">
-    <p><xsl:value-of select="./orgaunit_name"/></p>
+    <p><xsl:value-of select="./name"/></p>
   </xsl:template>
 
 <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Organization']" mode="cms:CT_text"
     name="cms:CT_text_com_arsdigita_cms_contenttypes_Organization">
-    <p><xsl:value-of select="./orgaunit_name"/></p>
+    <p><xsl:value-of select="./name"/></p>
   </xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file