diff --git a/tools/qfcc/source/cpp.c b/tools/qfcc/source/cpp.c
index a5d0adaff..c2be4c71e 100644
--- a/tools/qfcc/source/cpp.c
+++ b/tools/qfcc/source/cpp.c
@@ -222,10 +222,12 @@ preprocess_file (const char *filename)
 		}
 		if (!pid) {
 			// we're a child, check for abuse
-			//const char **a;
-			//for (a = cpp_argv; *a; a++)
-			//	printf ("%s ", *a);
-			//puts("");
+			if (options.verbosity > 1) {
+				const char **a;
+				for (a = cpp_argv; *a; a++)
+					printf ("%s ", *a);
+				puts("");
+			}
 			execvp (cpp_argv[0], (char **)cpp_argv);
 			perror (cpp_argv[0]);
 			exit (1);
diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c
index fc1865440..27608f5a4 100644
--- a/tools/qfcc/source/options.c
+++ b/tools/qfcc/source/options.c
@@ -100,6 +100,7 @@ static const char *short_options =
 	"I:"	// set includes
 	"U:"	// undefine
 	"N:"	// notice options
+	"M::"
 	;
 
 static void
@@ -342,6 +343,11 @@ DecodeArgs (int argc, char **argv)
 					free (opts);
 				}
 				break;
+			case 'M':
+				add_cpp_def (nva ("-M%s", optarg));
+				if (strchr ("FQT", optarg[0]))
+					add_cpp_def (argv[optind++]);
+				break;
 			default:
 				usage (1);
 		}