diff --git a/docs/markdown/Release-notes-for-0.42.0.md b/docs/markdown/Release-notes-for-0.42.0.md
index d6d53653a..fe4af7516 100644
--- a/docs/markdown/Release-notes-for-0.42.0.md
+++ b/docs/markdown/Release-notes-for-0.42.0.md
@@ -46,3 +46,8 @@ are `dylib` or `cdylib` for shared libraries, and `rlib` or
 Rust's [linkage reference][rust-linkage].
 
 [rust-linkage]: https://doc.rust-lang.org/reference/linkage.html
+
+## Simultaneous use of Address- and Undefined Behavior Sanitizers
+
+Both the address- and undefined behavior sanitizers can now be used
+simultaneously by passing `-Db_sanitize=address,undefined` to Meson.
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 6b5c4a489..9007cc5de 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -207,7 +207,7 @@ base_options = {'b_pch': coredata.UserBooleanOption('b_pch', 'Use precompiled he
                 'b_lto': coredata.UserBooleanOption('b_lto', 'Use link time optimization', False),
                 'b_sanitize': coredata.UserComboOption('b_sanitize',
                                                        'Code sanitizer to use',
-                                                       ['none', 'address', 'thread', 'undefined', 'memory'],
+                                                       ['none', 'address', 'thread', 'undefined', 'memory', 'address,undefined'],
                                                        'none'),
                 'b_lundef': coredata.UserBooleanOption('b_lundef', 'Use -Wl,--no-undefined when linking', True),
                 'b_asneeded': coredata.UserBooleanOption('b_asneeded', 'Use -Wl,--as-needed when linking', True),