diff -Nru appstream-0.9.4/debian/changelog appstream-0.9.4/debian/changelog
--- appstream-0.9.4/debian/changelog	2016-11-24 22:42:06.000000000 +0100
+++ appstream-0.9.4/debian/changelog	2017-03-30 00:16:40.000000000 +0200
@@ -1,3 +1,14 @@
+appstream (0.9.4-1ubuntu3) xenial; urgency=medium
+
+  [ Carlo Vanini ]
+  * modern-metadata-in-qt.patch: Fix type label for desktop
+    applications in the Qt library. (LP: #1663695)
+
+  [ Matthias Klumpp ]
+  * Fix autopkgtest tests.
+
+ -- Matthias Klumpp <mak@debian.org>  Thu, 30 Mar 2017 08:15:50 +0200
+
 appstream (0.9.4-1ubuntu2) xenial; urgency=medium
 
   * yaml-parser-errors.patch: Deal with errors in the YAML structure
diff -Nru appstream-0.9.4/debian/patches/05_modern-metadata-in-qt.patch appstream-0.9.4/debian/patches/05_modern-metadata-in-qt.patch
--- appstream-0.9.4/debian/patches/05_modern-metadata-in-qt.patch	1970-01-01 01:00:00.000000000 +0100
+++ appstream-0.9.4/debian/patches/05_modern-metadata-in-qt.patch	2017-03-30 00:14:47.000000000 +0200
@@ -0,0 +1,14 @@
+From: Carlo Vanini <silhusk@gmail.com>
+Subject: Use new metadata name for desktop applications in the Qt library.
+===================================================================
+--- a/qt/component.cpp
++++ b/qt/component.cpp
+@@ -322,7 +322,7 @@ Component::Kind Component::stringToKind(
+     if(kindString ==  QLatin1String("generic")) {
+         return KindGeneric;
+     }
+-    if (kindString == QLatin1String("desktop")) {
++    if (kindString == QLatin1String("desktop-application")) {
+         return KindDesktop;
+     }
+     if (kindString == QLatin1String("font")) {
diff -Nru appstream-0.9.4/debian/patches/series appstream-0.9.4/debian/patches/series
--- appstream-0.9.4/debian/patches/series	2016-11-24 22:42:06.000000000 +0100
+++ appstream-0.9.4/debian/patches/series	2017-03-30 00:14:47.000000000 +0200
@@ -2,3 +2,4 @@
 02_fix-decompression.patch
 03_yaml-parser-errors.patch
 04_modern-metadata.patch
+05_modern-metadata-in-qt.patch
diff -Nru appstream-0.9.4/debian/tests/build appstream-0.9.4/debian/tests/build
--- appstream-0.9.4/debian/tests/build	2016-04-18 16:27:01.000000000 +0200
+++ appstream-0.9.4/debian/tests/build	2017-03-30 00:15:38.000000000 +0200
@@ -41,7 +41,7 @@
 	g_debug ("Distro XML: %s", xml_distro);
 
 	g_assert_cmpstr (xml_upstream, ==, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-					   "<component type=\"desktop\">\n"
+					   "<component type=\"desktop-application\">\n"
 					   "  <id>org.example.Test.desktop</id>\n"
 					   "  <name>Test</name>\n"
 					   "  <summary>It does things</summary>\n"
@@ -49,7 +49,7 @@
 					   "</component>\n");
 	g_assert_cmpstr (xml_distro, ==, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
 					 "<components version=\"0.8\">\n"
-					 "  <component type=\"desktop\">\n"
+					 "  <component type=\"desktop-application\">\n"
 					 "    <id>org.example.Test.desktop</id>\n"
 					 "    <name>Test</name>\n"
 					 "    <summary>It does things</summary>\n"