diff --git a/src/asm/main.c b/src/asm/main.c
index f93af893..b703468c 100644
--- a/src/asm/main.c
+++ b/src/asm/main.c
@@ -267,7 +267,7 @@ main(int argc, char *argv[])
 
 	newopt = CurrentOptions;
 
-	while ((ch = getopt(argc, argv, "b:g:i:o:z:")) != -1) {
+	while ((ch = getopt(argc, argv, "b:g:i:o:p:")) != -1) {
 		switch (ch) {
 		case 'b':
 			if (strlen(optarg) == 2) {
@@ -292,12 +292,12 @@ main(int argc, char *argv[])
 		case 'o':
 			out_SetFileName(optarg);
 			break;
-		case 'z':
+		case 'p':
 			newopt.fillchar = strtoul(optarg, &ep, 0);
 			if (optarg[0] == '\0' || *ep != '\0')
-				errx(EX_USAGE, "Invalid argument for option 'z'");
+				errx(EX_USAGE, "Invalid argument for option 'p'");
 			if (newopt.fillchar < 0 || newopt.fillchar > 0xFF)
-				errx(EX_USAGE, "Argument for option 'z' must be between 0 and 0xFF");
+				errx(EX_USAGE, "Argument for option 'p' must be between 0 and 0xFF");
 			break;
 		default:
 			PrintUsage();
diff --git a/src/link/main.c b/src/link/main.c
index 7b6b058b..5c26fc21 100644
--- a/src/link/main.c
+++ b/src/link/main.c
@@ -57,7 +57,7 @@ main(int argc, char *argv[])
 	if (argc == 1)
 		usage();
 
-	while ((ch = getopt(argc, argv, "l:m:n:o:s:tz:")) != -1) {
+	while ((ch = getopt(argc, argv, "l:m:n:o:p:s:t")) != -1) {
 		switch (ch) {
 		case 'l':
 			lib_Readfile(optarg);
@@ -71,6 +71,13 @@ main(int argc, char *argv[])
 		case 'o':
 			out_Setname(optarg);
 			break;
+		case 'p':
+			fillchar = strtoul(optarg, &ep, 0);
+			if (optarg[0] == '\0' || *ep != '\0')
+				errx(EX_USAGE, "Invalid argument for option 'p'");
+			if (fillchar < 0 || fillchar > 0xFF)
+				errx(EX_USAGE, "Argument for option 'p' must be between 0 and 0xFF");
+			break;
 		case 's':
 			options |= OPT_SMART_C_LINK;
 			strcpy(smartlinkstartsymbol, optarg);
@@ -78,13 +85,6 @@ main(int argc, char *argv[])
 		case 't':
 			options |= OPT_SMALL;
 			break;
-		case 'z':
-			fillchar = strtoul(optarg, &ep, 0);
-			if (optarg[0] == '\0' || *ep != '\0')
-				errx(EX_USAGE, "Invalid argument for option 'z'");
-			if (fillchar < 0 || fillchar > 0xFF)
-				errx(EX_USAGE, "Argument for option 'z' must be between 0 and 0xFF");
-			break;
 		default:
 			usage();
 			/* NOTREACHED */