diff --git a/src/Core/FlatpakBackend.vala b/src/Core/FlatpakBackend.vala
index 15afe490f..d830e6a2a 100644
--- a/src/Core/FlatpakBackend.vala
+++ b/src/Core/FlatpakBackend.vala
@@ -129,7 +129,9 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
     construct {
         worker_thread = new Thread<bool> ("flatpak-worker", worker_func);
         user_appstream_pool = new AppStream.Pool ();
-#if HAS_APPSTREAM_0_15
+#if HAS_APPSTREAM_0_16
+        user_appstream_pool.set_flags (AppStream.PoolFlags.LOAD_OS_CATALOG);
+#elif HAS_APPSTREAM_0_15
         user_appstream_pool.set_flags (AppStream.PoolFlags.LOAD_OS_COLLECTION);
 #else
         user_appstream_pool.set_flags (AppStream.PoolFlags.READ_COLLECTION);
@@ -137,7 +139,9 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
 #endif
 
         system_appstream_pool = new AppStream.Pool ();
-#if HAS_APPSTREAM_0_15
+#if HAS_APPSTREAM_0_16
+        system_appstream_pool.set_flags (AppStream.PoolFlags.LOAD_OS_CATALOG);
+#elif HAS_APPSTREAM_0_15
         system_appstream_pool.set_flags (AppStream.PoolFlags.LOAD_OS_COLLECTION);
 #else
         system_appstream_pool.set_flags (AppStream.PoolFlags.READ_COLLECTION);
@@ -1039,7 +1043,10 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
     private void reload_appstream_pool () {
         var new_package_list = new Gee.HashMap<string, Package> ();
 
-#if HAS_APPSTREAM_0_15
+#if HAS_APPSTREAM_0_16
+        user_appstream_pool.reset_extra_data_locations ();
+        user_appstream_pool.add_extra_data_location (user_metadata_path, AppStream.FormatStyle.CATALOG);
+#elif HAS_APPSTREAM_0_15
         user_appstream_pool.reset_extra_data_locations ();
         user_appstream_pool.add_extra_data_location (user_metadata_path, AppStream.FormatStyle.COLLECTION);
 #else
@@ -1074,7 +1081,10 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
             });
         }
 
-#if HAS_APPSTREAM_0_15
+#if HAS_APPSTREAM_0_16
+        system_appstream_pool.reset_extra_data_locations ();
+        system_appstream_pool.add_extra_data_location (system_metadata_path, AppStream.FormatStyle.CATALOG);
+#elif HAS_APPSTREAM_0_15
         system_appstream_pool.reset_extra_data_locations ();
         system_appstream_pool.add_extra_data_location (system_metadata_path, AppStream.FormatStyle.COLLECTION);
 #else
diff --git a/src/Core/PackageKitBackend.vala b/src/Core/PackageKitBackend.vala
index f74900ca3..09da40741 100644
--- a/src/Core/PackageKitBackend.vala
+++ b/src/Core/PackageKitBackend.vala
@@ -165,7 +165,12 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
         // Clear out the default set of metadata locations and only use the folder that gets populated
         // with elementary's AppStream data.
 #if HIDE_UPSTREAM_DISTRO_APPS
-#if HAS_APPSTREAM_0_15
+#if HAS_APPSTREAM_0_16
+        // Don't load Ubuntu components
+        appstream_pool.set_load_std_data_locations (false);
+        appstream_pool.reset_extra_data_locations ();
+        appstream_pool.add_extra_data_location ("/usr/share/app-info", AppStream.FormatStyle.CATALOG);
+#elif HAS_APPSTREAM_0_15
         // Don't load Ubuntu components
         appstream_pool.set_load_std_data_locations (false);
         appstream_pool.reset_extra_data_locations ();
diff --git a/src/meson.build b/src/meson.build
index eabcae5da..4c38d22ab 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -72,6 +72,10 @@ if appstream.version().version_compare('>=0.15')
     args += '--define=HAS_APPSTREAM_0_15'
 endif
 
+if appstream.version().version_compare('>=0.16')
+    args += '--define=HAS_APPSTREAM_0_16'
+endif
+
 executable(
     meson.project_name(),
     appcenter_files,