diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index ad2876ad4d700d545b8abbed73bca6e0745ca9bc..e3df1705df6103bdc85abce7464a2d5f8e67933e 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -287,6 +287,7 @@ FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS)
 FEATURE_CHECK_LDFLAGS-libaio = -lrt
 
 FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes -ldl
+FEATURE_CHECK_LDFLAGS-disassembler-init-styled = -lbfd -lopcodes -ldl
 
 CORE_CFLAGS += -fno-omit-frame-pointer
 CORE_CFLAGS += -ggdb3
@@ -851,13 +852,16 @@ else
   ifeq ($(feature-libbfd-liberty), 1)
     EXTLIBS += -lbfd -lopcodes -liberty
     FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -ldl
+    FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -ldl
   else
     ifeq ($(feature-libbfd-liberty-z), 1)
       EXTLIBS += -lbfd -lopcodes -liberty -lz
       FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -lz -ldl
+      FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -lz -ldl
     endif
   endif
   $(call feature_check,disassembler-four-args)
+  $(call feature_check,disassembler-init-styled)
 endif
 
 ifeq ($(feature-libbfd-buildid), 1)
@@ -970,6 +974,10 @@ ifeq ($(feature-disassembler-four-args), 1)
     CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE
 endif
 
+ifeq ($(feature-disassembler-init-styled), 1)
+    CFLAGS += -DDISASM_INIT_STYLED
+endif
+
 ifeq (${IS_64_BIT}, 1)
   ifndef NO_PERF_READ_VDSO32
     $(call feature_check,compile-32)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index e8f188c2de8bf73f39bc554796aa51b504831681..a745f8809405aeed2b2bf6fbc73a6499f907a5db 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1686,7 +1686,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil
 #if defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT)
 #define PACKAGE "perf"
 #include <bfd.h>
-#include <dis-asm.h>
+#include <tools/dis-asm-compat.h>
 
 static int symbol__disassemble_bpf(struct symbol *sym,
 				   struct annotate_args *args)
@@ -1729,9 +1729,9 @@ static int symbol__disassemble_bpf(struct symbol *sym,
 		ret = errno;
 		goto out;
 	}
-	init_disassemble_info(&info, s,
-			      (fprintf_ftype) fprintf);
-
+	init_disassemble_info_compat(&info, s,
+				     (fprintf_ftype) fprintf,
+				     fprintf_styled);
 	info.arch = bfd_get_arch(bfdf);
 	info.mach = bfd_get_mach(bfdf);