diff --git a/Makefile b/Makefile
index a0bf1ec98..8a9c13f78 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ CHIP_OBJS = jedec.o stm50flw0x0x.o w39v080fa.o sharplhf00l04.o w29ee011.o \
 
 LIB_OBJS = layout.o
 
-CLI_OBJS = flashrom.o cli_classic.o print.o
+CLI_OBJS = flashrom.o cli_classic.o cli_output.o print.o
 
 PROGRAMMER_OBJS = udelay.o programmer.o
 
diff --git a/cli_classic.c b/cli_classic.c
index df174863a..d3e7a159e 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -205,7 +205,7 @@ int cli_classic(int argc, char *argv[])
 			chip_to_probe = strdup(optarg);
 			break;
 		case 'V':
-			verbose = 1;
+			verbose++;
 			break;
 		case 'E':
 			if (++operation_specified > 1) {
diff --git a/flash.h b/flash.h
index 648dc8339..027392f9e 100644
--- a/flash.h
+++ b/flash.h
@@ -504,6 +504,25 @@ int doit(struct flashchip *flash, int force, char *filename, int read_it, int wr
 #define OK 0
 #define NT 1    /* Not tested */
 
+/* cli_output.c */
+int print(int type, const char *fmt, ...);
+#define MSG_ERROR 0
+#define MSG_INFO 1
+#define MSG_DEBUG 2
+#define MSG_BARF 3
+#define msg_gerr(x) print(MSG_ERROR, x) /* general errors */
+#define msg_perr(x) print(MSG_ERROR, x) /* programmer errors */
+#define msg_cerr(x) print(MSG_ERROR, x) /* chip errors */
+#define msg_ginfo(x) print(MSG_INFO, x) /* general info */
+#define msg_pinfo(x) print(MSG_INFO, x) /* programmer info */
+#define msg_cinfo(x) print(MSG_INFO, x) /* chip info */
+#define msg_gdbg(x) print(MSG_DEBUG, x) /* general debug */
+#define msg_pdbg(x) print(MSG_DEBUG, x) /* programmer debug */
+#define msg_cdbg(x) print(MSG_DEBUG, x) /* chip debug */
+#define msg_gspew(x) print(MSG_BARF, x) /* general debug barf  */
+#define msg_pspew(x) print(MSG_BARF, x) /* programmer debug barf  */
+#define msg_cspew(x) print(MSG_BARF, x) /* chip debug barf  */
+
 /* cli_classic.c */
 int cli_classic(int argc, char *argv[]);