diff --git a/Parser/firstsets.c b/Parser/firstsets.c
index d6c4084d066..fcd9ffd240a 100644
--- a/Parser/firstsets.c
+++ b/Parser/firstsets.c
@@ -15,8 +15,9 @@ addfirstsets(grammar *g)
 {
 	int i;
 	dfa *d;
-	
-	printf("Adding FIRST sets ...\n");
+
+	if (Py_DebugFlag)
+		printf("Adding FIRST sets ...\n");
 	for (i = 0; i < g->g_ndfas; i++) {
 		d = &g->g_dfa[i];
 		if (d->d_first == NULL)
diff --git a/Parser/pgen.c b/Parser/pgen.c
index 961f3bc1ebf..47c817f3ff4 100644
--- a/Parser/pgen.c
+++ b/Parser/pgen.c
@@ -149,8 +149,9 @@ metacompile(node *n)
 {
 	nfagrammar *gr;
 	int i;
-	
-	printf("Compiling (meta-) parse tree into NFA grammar\n");
+
+	if (Py_DebugFlag)
+		printf("Compiling (meta-) parse tree into NFA grammar\n");
 	gr = newnfagrammar();
 	REQ(n, MSTART);
 	i = n->n_nchildren - 1; /* Last child is ENDMARKER */
@@ -645,8 +646,8 @@ maketables(nfagrammar *gr)
 		if (Py_DebugFlag) {
 			printf("Dump of NFA for '%s' ...\n", nf->nf_name);
 			dumpnfa(&gr->gr_ll, nf);
+			printf("Making DFA for '%s' ...\n", nf->nf_name);
 		}
-		printf("Making DFA for '%s' ...\n", nf->nf_name);
 		d = adddfa(g, nf->nf_type, nf->nf_name);
 		makedfa(gr, gr->gr_nfa[i], d);
 	}
diff --git a/Parser/pgenmain.c b/Parser/pgenmain.c
index 32fb9561f4e..2a284bc08a5 100644
--- a/Parser/pgenmain.c
+++ b/Parser/pgenmain.c
@@ -62,7 +62,8 @@ main(int argc, char **argv)
 		perror(graminit_c);
 		Py_Exit(1);
 	}
-	printf("Writing %s ...\n", graminit_c);
+	if (Py_DebugFlag)
+		printf("Writing %s ...\n", graminit_c);
 	printgrammar(g, fp);
 	fclose(fp);
 	fp = fopen(graminit_h, "w");
@@ -70,7 +71,8 @@ main(int argc, char **argv)
 		perror(graminit_h);
 		Py_Exit(1);
 	}
-	printf("Writing %s ...\n", graminit_h);
+	if (Py_DebugFlag)
+		printf("Writing %s ...\n", graminit_h);
 	printnonterminals(g, fp);
 	fclose(fp);
 	Py_Exit(0);