diff --git a/attributemap/name2oid.php b/attributemap/name2oid.php
index 2f87f09498b7ab8bbff5c4ebc427f14f53936bd6..9d78f32c15d47ba113087e9b1db82f7b8267e73e 100644
--- a/attributemap/name2oid.php
+++ b/attributemap/name2oid.php
@@ -165,5 +165,6 @@ $attributemap = array(
 	'x121Address' => 'urn:oid:2.5.4.24',
 	'x500UniqueIdentifier' => 'urn:oid:2.5.4.45',
 	'schacHomeOrganization' => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
+	'schacHomeOrganizationType' => 'urn:oid:1.3.6.1.4.1.25178.1.2.10',
 	'schacPersonalUniqueCode' => 'urn:oid:1.3.6.1.4.1.25178.1.2.14',
 );
diff --git a/attributemap/name2urn.php b/attributemap/name2urn.php
index 8ba62e8f47af70b052e82c084f6d9dd75384c482..1861328145bbf2f1e4643b6d8d5b028c2147ca25 100644
--- a/attributemap/name2urn.php
+++ b/attributemap/name2urn.php
@@ -130,6 +130,8 @@ $attributemap = array(
 	'roomNumber' => 'urn:mace:dir:attribute-def:roomNumber',
 	'sOARecord' => 'urn:mace:dir:attribute-def:sOARecord',
 	'schacGender' => 'urn:mace:dir:attribute-def:schacGender',
+	'schacHomeOrganization' => 'urn:mace:terena.org:attribute-def:schacHomeOrganization',
+	'schacHomeOrganizationType' => 'urn:mace:terena.org:attribute-def:schacHomeOrganizationType',
 	'searchGuide' => 'urn:mace:dir:attribute-def:searchGuide',
 	'secretary' => 'urn:mace:dir:attribute-def:secretary',
 	'seeAlso' => 'urn:mace:dir:attribute-def:seeAlso',
diff --git a/attributemap/oid2name.php b/attributemap/oid2name.php
index fd6ad198a27b6d4100d0da6804f924ddc221a9c2..459d3ae31f0363713906cc9c20e564a8143d0f6f 100644
--- a/attributemap/oid2name.php
+++ b/attributemap/oid2name.php
@@ -144,5 +144,6 @@ $attributemap = array(
 	'urn:oid:2.5.4.8' => 'st',
 	'urn:oid:2.5.4.9' => 'street',
 	'urn:oid:1.3.6.1.4.1.25178.1.2.9' => 'schacHomeOrganization',
+	'urn:oid:1.3.6.1.4.1.25178.1.2.10' => 'schacHomeOrganizationType',
 	'urn:oid:1.3.6.1.4.1.25178.1.2.14' => 'schacPersonalUniqueCode',
 );
diff --git a/attributemap/oid2urn.php b/attributemap/oid2urn.php
index 755216246f913c599931aa48177e2a4cc5accf9b..149fd3f2bce9729b5d4fa96d7fc37053a54b1af8 100644
--- a/attributemap/oid2urn.php
+++ b/attributemap/oid2urn.php
@@ -78,6 +78,8 @@ $attributemap = array(
 	'urn:oid:1.3.6.1.4.1.5923.1.2.1.5' => 'urn:mace:dir:attribute-def:eduOrgSuperiorURI',
 	'urn:oid:1.3.6.1.4.1.5923.1.2.1.6' => 'urn:mace:dir:attribute-def:eduOrgWhitePagesURI',
 	'urn:oid:1.3.6.1.4.1.25178.1.2.2' => 'urn:mace:dir:attribute-def:schacGender',	
+	'urn:oid:1.3.6.1.4.1.25178.1.2.9' => 'urn:mace:terena.org:attribute-def:schacHomeOrganization',
+	'urn:oid:1.3.6.1.4.1.25178.1.2.10' => 'urn:mace:terena.org:attribute-def:schacHomeOrganizationType',
 	'urn:oid:2.16.840.1.113730.3.1.1' => 'urn:mace:dir:attribute-def:carLicense',
 	'urn:oid:2.16.840.1.113730.3.1.2' => 'urn:mace:dir:attribute-def:departmentNumber',
 	'urn:oid:2.16.840.1.113730.3.1.216' => 'urn:mace:dir:attribute-def:userPKCS12',
diff --git a/attributemap/urn2name.php b/attributemap/urn2name.php
index 2c215ea46670817762054420f7e081420a047433..692518dc87e2708a17c86c2320fe36f0388e50f6 100644
--- a/attributemap/urn2name.php
+++ b/attributemap/urn2name.php
@@ -163,4 +163,6 @@ $attributemap = array(
 	'urn:mace:dir:attribute-def:userid' => 'userid',
 	'urn:mace:dir:attribute-def:x121Address' => 'x121Address',
 	'urn:mace:dir:attribute-def:x500UniqueIdentifier' => 'x500UniqueIdentifier',
+	'urn:mace:terena.org:attribute-def:schacHomeOrganization' => 'schacHomeOrganization',
+	'urn:mace:terena.org:attribute-def:schacHomeOrganizationType' => 'schacHomeOrganizationType',
 );
diff --git a/attributemap/urn2oid.php b/attributemap/urn2oid.php
index 3d28ca34605e5dcfcdfcb82d1cdf3fef2fdd836f..84ba19a12dc5fddd517285b641f50cc3bef98cef 100644
--- a/attributemap/urn2oid.php
+++ b/attributemap/urn2oid.php
@@ -163,4 +163,6 @@ $attributemap = array(
 	'urn:mace:dir:attribute-def:userid' => 'urn:oid:0.9.2342.19200300.100.1.1',
 	'urn:mace:dir:attribute-def:x121Address' => 'urn:oid:2.5.4.24',
 	'urn:mace:dir:attribute-def:x500UniqueIdentifier' => 'urn:oid:2.5.4.45',
+	'urn:mace:terena.org:attribute-def:schacHomeOrganization' => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
+	'urn:mace:terena.org:attribute-def:schacHomeOrganizationType' => 'urn:oid:1.3.6.1.4.1.25178.1.2.10',
 );