diff --git a/cstool/cstool.c b/cstool/cstool.c
index 5f7233cc..b6c4c1bc 100644
--- a/cstool/cstool.c
+++ b/cstool/cstool.c
@@ -135,7 +135,7 @@ static uint8_t *preprocess(char *code, size_t *size)
 static void usage(char *prog)
 {
 	printf("Cstool for Capstone Disassembler Engine v%u.%u.%u\n\n", CS_VERSION_MAJOR, CS_VERSION_MINOR, CS_VERSION_EXTRA);
-	printf("Syntax: %s [-u|-d|-s] <arch+mode> <assembly-hexstring> [start-address-in-hex-format]\n", prog);
+	printf("Syntax: %s [-u|-d|-s|-v] <arch+mode> <assembly-hexstring> [start-address-in-hex-format]\n", prog);
 	printf("\nThe following <arch+mode> options are supported:\n");
 
 	if (cs_support(CS_ARCH_X86)) {
@@ -216,7 +216,8 @@ static void usage(char *prog)
 	printf("\nExtra options:\n");
 	printf("        -d show detailed information of the instructions\n");
 	printf("        -u show immediates as unsigned\n");
-	printf("        -s decode in SKIPDATA mode\n\n");
+	printf("        -s decode in SKIPDATA mode\n");
+	printf("        -v show version & Capstone core build info\n\n");
 }
 
 static void print_details(csh handle, cs_arch arch, cs_mode md, cs_insn *ins)
@@ -306,7 +307,66 @@ int main(int argc, char **argv)
 				detail_flag = true;
 				break;
 			case 'v':
-				printf("%u.%u.%u\n", CS_VERSION_MAJOR, CS_VERSION_MINOR, CS_VERSION_EXTRA);
+				printf("Cstool for Capstone Disassembler Engine v%u.%u.%u\n", CS_VERSION_MAJOR, CS_VERSION_MINOR, CS_VERSION_EXTRA);
+
+				printf("Capstone build: ");
+				if (cs_support(CS_ARCH_X86)) {
+					printf("x86=1 ");
+				}
+
+				if (cs_support(CS_ARCH_ARM)) {
+					printf("arm=1 ");
+				}
+
+				if (cs_support(CS_ARCH_ARM64)) {
+					printf("arm64=1 ");
+				}
+
+				if (cs_support(CS_ARCH_MIPS)) {
+					printf("mips=1 ");
+				}
+
+				if (cs_support(CS_ARCH_PPC)) {
+					printf("ppc=1 ");
+				}
+
+				if (cs_support(CS_ARCH_SPARC)) {
+					printf("sparc=1 ");
+				}
+
+				if (cs_support(CS_ARCH_SYSZ)) {
+					printf("sysz=1 ");
+				}
+
+				if (cs_support(CS_ARCH_XCORE)) {
+					printf("xcore=1 ");
+				}
+
+				if (cs_support(CS_ARCH_M68K)) {
+					printf("m68k=1 ");
+				}
+
+				if (cs_support(CS_ARCH_TMS320C64X)) {
+					printf("tms320c64x=1 ");
+				}
+
+				if (cs_support(CS_ARCH_M680X)) {
+					printf("m680x=1 ");
+				}
+
+				if (cs_support(CS_ARCH_EVM)) {
+					printf("evm=1 ");
+				}
+
+				if (cs_support(CS_SUPPORT_DIET)) {
+					printf("diet=1 ");
+				}
+
+				if (cs_support(CS_SUPPORT_X86_REDUCE)) {
+					printf("x86_reduce=1 ");
+				}
+
+				printf("\n");
 				return 0;
 			case 'h':
 				usage(argv[0]);