diff --git a/glib.supp b/glib.supp
index 2c20b1238..baec2f33b 100644
--- a/glib.supp
+++ b/glib.supp
@@ -22,6 +22,7 @@
 {
 	gnutls-init-calloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:gtls_gnutls_init
@@ -30,6 +31,7 @@
 {
 	gnutls-init-realloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:realloc
 	...
 	fun:gtls_gnutls_init
@@ -38,6 +40,7 @@
 {
 	g-tls-backend-gnutls-init
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:g_once_impl
 	fun:g_tls_backend_gnutls_init
 }
@@ -45,6 +48,7 @@
 {
 	p11-tokens-init
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:create_tokens_inlock
@@ -55,6 +59,7 @@
 {
 	g-local-vfs-getpwnam
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:getpwnam
@@ -64,6 +69,7 @@
 {
 	glib-init-malloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_quark_init
@@ -74,6 +80,7 @@
 {
 	glib-init-calloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_quark_init
@@ -84,6 +91,7 @@
 {
 	gobject-init-malloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:gobject_init_ctor
@@ -92,6 +100,7 @@
 {
 	gobject-init-realloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:realloc
 	...
 	fun:gobject_init_ctor
@@ -100,6 +109,7 @@
 {
 	gobject-init-calloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:gobject_init_ctor
@@ -108,6 +118,7 @@
 {
 	g-type-register-dynamic
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_type_register_dynamic
@@ -116,6 +127,7 @@
 {
 	g-type-register-static
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_type_register_static
@@ -124,6 +136,7 @@
 {
 	g-type-register-static-realloc
 	Memcheck:Leak
+	match-leak-kinds:possible,reachable
 	fun:realloc
 	...
 	fun:g_type_register_static
@@ -132,6 +145,7 @@
 {
 	g-type-register-static-calloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_type_register_static
@@ -140,6 +154,7 @@
 {
 	g-type-add-interface-dynamic
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_type_add_interface_dynamic
@@ -148,6 +163,7 @@
 {
 	g-type-add-interface-static
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_type_add_interface_static
@@ -174,6 +190,7 @@
 {
 	g-test-rand-init
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_rand_new_with_seed_array
@@ -185,6 +202,7 @@
 {
 	g-test-rand-init2
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_rand_new_with_seed_array
@@ -197,6 +215,7 @@
 {
 	g-quark-table-new
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:g_hash_table_new
 	...
 	fun:quark_new
@@ -205,6 +224,7 @@
 {
 	g-quark-table-resize
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	...
 	fun:g_hash_table_resize
 	...
@@ -214,6 +234,7 @@
 {
 	g-type-interface-init
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:type_iface_vtable_base_init_Wm
@@ -231,6 +252,7 @@
 {
 	g-type-class-init
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:g_type_create_instance
 	...
 	fun:type_class_init_Wm
@@ -325,6 +347,7 @@
 {
 	g-io-module-default-singleton-malloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_type_create_instance
@@ -335,6 +358,7 @@
 {
 	g-io-module-default-singleton-calloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_type_create_instance
@@ -347,6 +371,7 @@
 {
 	g-io-module-default-singleton
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:g_type_create_instance
 	...
 	fun:_g_io_module_get_default
@@ -355,6 +380,7 @@
 {
 	g-io-module-default-singleton-module
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_module_open
@@ -365,6 +391,7 @@
 {
 	g-io-module-default-singleton-name
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_strdup
@@ -375,6 +402,7 @@
 {
 	g-get-language-names-malloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_get_language_names
@@ -383,6 +411,7 @@
 {
 	g-get-language-names-calloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_get_language_names
@@ -391,6 +420,7 @@
 {
 	g-static-mutex
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_static_mutex_get_mutex_impl
@@ -399,6 +429,7 @@
 {
 	g-system-thread-init
 	Memcheck:Leak
+	match-leak-kinds:possible,reachable
 	fun:calloc
 	...
 	fun:g_system_thread_new
@@ -407,6 +438,7 @@
 {
 	g-io-module-default-proxy-resolver-gnome
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_proxy_resolver_gnome_init
@@ -418,6 +450,7 @@
 {
 	g-threaded-resolver-getaddrinfo-config
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:__resolv_conf_allocate
@@ -697,9 +730,11 @@
 }
 
 # g_set_user_dirs() deliberately leaks the previous cached g_get_user_*() values.
+# These will not all be reachable on exit.
 {
 	g_set_user_dirs_str
 	Memcheck:Leak
+	match-leak-kinds:definite,reachable
 	fun:malloc
 	...
 	fun:set_str_if_different
@@ -707,9 +742,11 @@
 }
 
 # g_set_user_dirs() deliberately leaks the previous cached g_get_user_*() values.
+# These will not all be reachable on exit.
 {
 	g_set_user_dirs_strv
 	Memcheck:Leak
+	match-leak-kinds:definite,reachable
 	fun:malloc
 	...
 	fun:set_strv_if_different
@@ -720,6 +757,7 @@
 {
 	g_get_system_data_dirs
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_build_system_data_dirs
@@ -730,6 +768,7 @@
 {
 	g_get_user_data_dir
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:realloc
 	...
 	fun:g_build_user_data_dir
@@ -740,6 +779,7 @@
 {
 	desktop_file_dirs_malloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:desktop_file_dirs_lock
@@ -749,6 +789,7 @@
 {
 	desktop_file_dirs_realloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:realloc
 	...
 	fun:desktop_file_dirs_lock
@@ -758,6 +799,7 @@
 {
 	desktop_file_dir_unindexed_setup_search
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:desktop_file_dir_unindexed_setup_search
@@ -768,6 +810,7 @@
 {
 	g_io_extension_point_register
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_io_extension_point_register
@@ -777,6 +820,7 @@
 {
 	g_strerror
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_locale_to_utf8
@@ -787,6 +831,7 @@
 {
 	g_socket_connection_factory_register_type
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_socket_connection_factory_register_type
@@ -796,6 +841,7 @@
 {
 	g_dbus_error_quark
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_dbus_error_register_error_domain
@@ -806,6 +852,7 @@
 {
 	g_private_set_alloc0
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_private_set_alloc0
@@ -813,6 +860,7 @@
 {
 	g_private_set_alloc0-calloc
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:g_private_set_alloc0
@@ -822,6 +870,7 @@
 {
 	g_main_context_push_thread_default
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:g_queue_new
@@ -832,6 +881,7 @@
 {
 	g_file_info_attribute_cache
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:ensure_attribute_hash
@@ -841,6 +891,7 @@
 {
 	g_file_info_attribute_cache2
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:ensure_attribute_hash
@@ -850,6 +901,7 @@
 {
 	g_file_info_attribute_cache3
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:malloc
 	...
 	fun:lookup_namespace
@@ -859,9 +911,10 @@
 {
 	g_file_info_attribute_cache4
 	Memcheck:Leak
+	match-leak-kinds:reachable
 	fun:calloc
 	...
 	fun:lookup_namespace
 	...
 	fun:g_file_*
-}
\ No newline at end of file
+}