diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 4ecf57cac704229ead69ba8aa0e998e426e9ef36..95eb63ed11bcd452392c93d197e8884fde11bfef 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -108,7 +108,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTU
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY
   DESC 'GOsa - Class to mark Departments for GOsa'
   MUST  ( ou $ description )
-  MAY   ( manager ))
+  MAY   ( manager $ co ) )
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
   DESC 'GOsa - Class for GOsa Accounts'
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index 32c3ba547b29cdf781cae5d3d577951673a12def..d0096e48bbf4fec93e6445ece3fa72e2592746fd 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -96,6 +96,9 @@ class department extends simplePlugin
           new StringAttribute(
             _('Location'), _('Location'), 'l', FALSE
           ),
+          new StringAttribute(
+            _('Country'), _('Country'), 'co', FALSE
+          ),
           new TextAreaAttribute(
             _('Address'), sprintf(_('A postal address for this %s'), $name),
             'postalAddress', FALSE