diff --git a/src/parser.c b/src/parser.c
index e5d71c5..edfd0e5 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -114,7 +114,7 @@ static int _parse_error(C99 * c99, char const * format, ...)
 	Token * token = c99->token;
 	va_list ap;
 
-	fprintf(stderr, "%s%s:%u, near \"%s\": ", PACKAGE ": ",
+	fprintf(stderr, "%s%s:%u, near \"%s\": error: ", PACKAGE ": ",
 			token_get_filename(token), token_get_line(token),
 			token_get_string(token));
 	va_start(ap, format);
diff --git a/src/scanner.c b/src/scanner.c
index 1b4f493..df7fa7b 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -20,6 +20,7 @@
 #include <ctype.h>
 #include "common.h"
 #include "c99.h"
+#include "../config.h"
 
 
 /* private */
@@ -108,6 +109,13 @@ static int _scan_skip_meta(C99 * c99)
 				&& (code < C99_CODE_META_FIRST
 					|| code > C99_CODE_META_LAST))
 			break;
+		if(code == C99_CODE_META_ERROR || code == C99_CODE_META_WARNING)
+			fprintf(stderr, "%s%s%s%u%s%s%s%s\n", PACKAGE ": ",
+					token_get_filename(c99->token), ":",
+					token_get_line(c99->token), ": ",
+					(code == C99_CODE_META_ERROR)
+					? "error" : "warning", ": ",
+					token_get_string(c99->token));
 		token_delete(c99->token);
 	}
 	return ret;