diff --git a/PKG-INFO b/PKG-INFO
index 1caa4b57998c525be0d28b1da197960e4df8c9ff..5f502f918fd66bc348e587d820162e76bbe76daf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: swh.model
-Version: 0.6.4
+Version: 0.6.5
 Summary: Software Heritage data model
 Home-page: https://forge.softwareheritage.org/diffusion/DMOD/
 Author: Software Heritage developers
diff --git a/debian/changelog b/debian/changelog
index c88027a72fa8c303467acb3377e27ad0c8cd98e7..b9f3c379ec86b3c302d543656ed77d07025e8a10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-swh-model (0.6.4-1~swh1~bpo10+1) buster-swh; urgency=medium
+swh-model (0.6.5-1~swh1) unstable-swh; urgency=medium
 
-  * Rebuild for buster-swh
+  * New upstream release 0.6.5     - (tagged by Antoine R. Dumont
+    (@ardumont) <ardumont@softwareheritage.org> on 2020-08-06 19:59:26
+    +0200)
+  * Upstream changes:     - v0.6.5     - model: Add final object_type
+    field on metadata related model objects
 
- -- Software Heritage autobuilder (on jenkins-debian1) <jenkins@jenkins-debian1.internal.softwareheritage.org>  Thu, 06 Aug 2020 16:50:04 +0000
+ -- Software Heritage autobuilder (on jenkins-debian1) <jenkins@jenkins-debian1.internal.softwareheritage.org>  Thu, 06 Aug 2020 18:01:05 +0000
 
 swh-model (0.6.4-1~swh1) unstable-swh; urgency=medium
 
diff --git a/swh.model.egg-info/PKG-INFO b/swh.model.egg-info/PKG-INFO
index 1caa4b57998c525be0d28b1da197960e4df8c9ff..5f502f918fd66bc348e587d820162e76bbe76daf 100644
--- a/swh.model.egg-info/PKG-INFO
+++ b/swh.model.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: swh.model
-Version: 0.6.4
+Version: 0.6.5
 Summary: Software Heritage data model
 Home-page: https://forge.softwareheritage.org/diffusion/DMOD/
 Author: Software Heritage developers
diff --git a/swh/model/model.py b/swh/model/model.py
index ff11f1cb2e72cd74dacd6cac54c8b30a131f1595..dd73bf99b6a8f52aca76cee43028f1ebf4e9d424 100644
--- a/swh/model/model.py
+++ b/swh/model/model.py
@@ -736,6 +736,8 @@ class MetadataAuthority(BaseModel):
     """Represents an entity that provides metadata about an origin or
     software artifact."""
 
+    object_type: Final = "metadata_authority"
+
     type = attr.ib(type=MetadataAuthorityType, validator=type_validator())
     url = attr.ib(type=str, validator=type_validator())
     metadata = attr.ib(
@@ -762,6 +764,8 @@ class MetadataFetcher(BaseModel):
     """Represents a software component used to fetch metadata from a metadata
     authority, and ingest them into the Software Heritage archive."""
 
+    object_type: Final = "metadata_fetcher"
+
     name = attr.ib(type=str, validator=type_validator())
     version = attr.ib(type=str, validator=type_validator())
     metadata = attr.ib(
@@ -791,6 +795,8 @@ class MetadataTargetType(Enum):
 
 @attr.s(frozen=True)
 class RawExtrinsicMetadata(BaseModel):
+    object_type: Final = "raw_extrinsic_metadata"
+
     # target object
     type = attr.ib(type=MetadataTargetType, validator=type_validator())
     id = attr.ib(type=Union[str, SWHID], validator=type_validator())