diff --git a/src/cmd/6a/lex.c b/src/cmd/6a/lex.c
index ff0a0d56ee..1a1e30f152 100644
--- a/src/cmd/6a/lex.c
+++ b/src/cmd/6a/lex.c
@@ -41,6 +41,7 @@ main(int argc, char *argv[])
 
 	thechar = '6';
 	thestring = "amd64";
+
 	memset(debug, 0, sizeof(debug));
 	cinit();
 	outfile = 0;
@@ -166,7 +167,7 @@ assemble(char *file)
 	pass = 1;
 	pinit(file);
 
-	Bprint(&obuf, "x86-64\n");
+	Bprint(&obuf, "%s\n", thestring);
 
 	for(i=0; i<nDlist; i++)
 		dodefine(Dlist[i]);
diff --git a/src/cmd/6c/swt.c b/src/cmd/6c/swt.c
index 5b2a6ca1eb..90bd545cc0 100644
--- a/src/cmd/6c/swt.c
+++ b/src/cmd/6c/swt.c
@@ -231,7 +231,7 @@ outcode(void)
 	}
 	Binit(&b, f, OWRITE);
 
-	Bprint(&b, "x86-64\n");
+	Bprint(&b, "%s\n", thestring);
 	Bprint(&b, "!\n");
 
 	outhist(&b);
diff --git a/src/cmd/6g/obj.c b/src/cmd/6g/obj.c
index 47ae0abf05..01014655ca 100644
--- a/src/cmd/6g/obj.c
+++ b/src/cmd/6g/obj.c
@@ -49,7 +49,7 @@ dumpobj(void)
 	if(bout == nil)
 		fatal("cant open %s", outfile);
 
-	Bprint(bout, "x86-64\n");
+	Bprint(bout, "amd64\n");
 	Bprint(bout, "  exports automatically generated from\n");
 	Bprint(bout, "  %s in package \"%s\"\n", curio.infile, package);
 	dumpexport();