diff --git a/gef.py b/gef.py
index 13e26eb..2f189eb 100644
--- a/gef.py
+++ b/gef.py
@@ -1160,6 +1160,7 @@ def capstone_disassemble(location, nb_insn, **kwargs):
     capstone    = sys.modules["capstone"]
     arch, mode  = get_capstone_arch(arch=kwargs.get("arch", None), mode=kwargs.get("mode", None), endian=kwargs.get("endian", None))
     cs          = capstone.Cs(arch, mode)
+    cs.syntax   = capstone.CS_OPT_SYNTAX_ATT
     cs.detail   = True

     page_start  = align_address_to_page(location)
@@ -8395,13 +8396,6 @@ if __name__  == "__main__":
         # pretty print
         gdb.execute("set print pretty on")

-        try:
-            # this will raise a gdb.error unless we're on x86
-            gdb.execute("set disassembly-flavor intel")
-        except gdb.error:
-            # we can safely ignore this
-            pass
-
         # SIGALRM will simply display a message, but gdb won't forward the signal to the process
         gdb.execute("handle SIGALRM print nopass")