diff --git a/gst-libs/gst/tag/gstxmptag.c b/gst-libs/gst/tag/gstxmptag.c
index 69d3059964..ee6b8ecfca 100644
--- a/gst-libs/gst/tag/gstxmptag.c
+++ b/gst-libs/gst/tag/gstxmptag.c
@@ -474,6 +474,11 @@ _init_xmp_tag_map ()
   _xmp_tag_add_simple_mapping (GST_TAG_USER_RATING, "xmp:Rating", NULL,
       deserialize_xmp_rating);
 
+  /* tiff */
+  _xmp_tag_add_simple_mapping (GST_TAG_DEVICE_MANUFACTURER, "tiff:Make", NULL,
+      NULL);
+  _xmp_tag_add_simple_mapping (GST_TAG_DEVICE_MODEL, "tiff:Model", NULL, NULL);
+
   /* exif schema */
   _xmp_tag_add_simple_mapping (GST_TAG_GEO_LOCATION_LATITUDE,
       "exif:GPSLatitude", serialize_exif_latitude, deserialize_exif_latitude);
diff --git a/tests/check/libs/tag.c b/tests/check/libs/tag.c
index 9ed46eb6e9..0fb5c79847 100644
--- a/tests/check/libs/tag.c
+++ b/tests/check/libs/tag.c
@@ -936,6 +936,9 @@ GST_START_TEST (test_xmp_tags_serialization_deserialization)
   do_xmp_tag_serialization_deserialization (GST_TAG_GEO_LOCATION_CITY, &value);
   do_xmp_tag_serialization_deserialization (GST_TAG_GEO_LOCATION_SUBLOCATION,
       &value);
+  do_xmp_tag_serialization_deserialization (GST_TAG_DEVICE_MANUFACTURER,
+      &value);
+  do_xmp_tag_serialization_deserialization (GST_TAG_DEVICE_MODEL, &value);
 
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_DOUBLE);