diff --git a/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch b/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch
index ec7ea83ffd1e..bd61843acf5c 100644
--- a/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch
+++ b/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch
@@ -40,6 +40,8 @@ Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
 [Retrieved from:
 https://github.com/efficios/babeltrace/commit/28ba44ad9ca14153e96c94a9100423ea224c1af3]
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Dario: adapt to 2.0.6]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  configure.ac                    |  74 +++++++++------
  m4/ax_compiler_flags.m4         | 158 -------------------------------
@@ -56,7 +58,7 @@ diff --git a/configure.ac b/configure.ac
 index 055fba101..7ebcf2ad4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -660,25 +660,35 @@ target.
+@@ -694,25 +694,35 @@
  CFLAGS=${save_CFLAGS}
  
  # Detect C and LD warning flags supported by the compiler.
@@ -110,14 +112,11 @@ index 055fba101..7ebcf2ad4 100644
  		dnl
  		dnl Some versions of SWIG (like 3.0.12) generate code that produces
  		dnl -Wcast-function-type warnings.  This warning is present in gcc >= 8.  This
-@@ -692,24 +702,32 @@ AX_COMPILER_FLAGS(
- 		dnl
+@@ -727,24 +737,32 @@
  		dnl Ref: https://github.com/swig/swig/issues/1259
  		-Wno-cast-function-type dnl
+ 		-Wno-suggest-attribute=format dnl
 -	])
--
--# CFLAGS from AX_COMPILER_FLAGS.
--AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}"
 +		-Wno-missing-field-initializers dnl
 +	],
 +	[WARN_CFLAGS],
@@ -131,6 +130,9 @@ index 055fba101..7ebcf2ad4 100644
 +	[WARN_CFLAGS="${WARN_CFLAGS} -Werror"]
 +)
  
+-# CFLAGS from AX_COMPILER_FLAGS.
+-AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}"
+-
 -# The test used in AX_COMPILER_FLAGS, generated using AC_LANG_PROGRAM, is
 +# The test used in AX_APPEND_COMPILE_FLAGS, generated using AC_LANG_PROGRAM, is
  # written in such a way that it triggers a -Wold-style-definition warning.  So
diff --git a/package/babeltrace2/babeltrace2.hash b/package/babeltrace2/babeltrace2.hash
index 164e65cded99..3caf52a79260 100644
--- a/package/babeltrace2/babeltrace2.hash
+++ b/package/babeltrace2/babeltrace2.hash
@@ -1,5 +1,5 @@
 # From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.4.tar.bz2.sha256
-sha256  774f116685dab5db9c51577dde43c8c1df482aae6bb78a089b1e9e7c8b489bca  babeltrace2-2.0.4.tar.bz2
+sha256  a01c7e75e642de0b5b91f32cc706234c99eb556fcd52c9959045dc23a9ec52c9  babeltrace2-2.0.6.tar.bz2
 
 # Hash for license files
 sha256  d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e  LICENSE
diff --git a/package/babeltrace2/babeltrace2.mk b/package/babeltrace2/babeltrace2.mk
index 2b2ab7db4078..f3f1543c0e37 100644
--- a/package/babeltrace2/babeltrace2.mk
+++ b/package/babeltrace2/babeltrace2.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 BABELTRACE2_SITE = https://www.efficios.com/files/babeltrace
-BABELTRACE2_VERSION = 2.0.4
+BABELTRACE2_VERSION = 2.0.6
 BABELTRACE2_SOURCE = babeltrace2-$(BABELTRACE2_VERSION).tar.bz2
 BABELTRACE2_LICENSE = MIT, LGPL-2.1 (src/common/list.h), GPL-2.0 (test code)
 BABELTRACE2_LICENSE_FILES = mit-license.txt lgpl-2.1.txt gpl-2.0.txt LICENSE