diff --git a/README b/README
index c936841..7c29823 100644
--- a/README
+++ b/README
@@ -46,7 +46,7 @@ The following tools are implemented ('*' == finished, '#' == UTF-8 support,
 =*| md5sum          non-posix                    none
 =*| mkdir           yes                          none
 =*| mkfifo          yes                          none
-=*  mktemp          non-posix                    none
+=*| mktemp          non-posix                    none
 =*| mv              yes                          none (-i)
 =*| nice            yes                          none
 =   nl              no                           -d, -f, -h, -p
diff --git a/mktemp.c b/mktemp.c
index 08796cd..8dbb210 100644
--- a/mktemp.c
+++ b/mktemp.c
@@ -12,16 +12,13 @@ usage(void)
 	eprintf("usage: %s [-dq] [template]\n", argv0);
 }
 
-static int dflag = 0;
-static int qflag = 0;
-
 int
 main(int argc, char *argv[])
 {
-	char *template = "tmp.XXXXXXXXXX";
-	char *tmpdir = "/tmp", *p;
-	char path[PATH_MAX], tmp[PATH_MAX];
-	int fd;
+	int dflag = 0, qflag = 0, fd;
+	char *template = "tmp.XXXXXXXXXX",
+	     *tmpdir = "/tmp", *p,
+	      path[PATH_MAX], tmp[PATH_MAX];
 
 	ARGBEGIN {
 	case 'd':
@@ -61,16 +58,17 @@ main(int argc, char *argv[])
 		if (!mkdtemp(path)) {
 			if (!qflag)
 				eprintf("mkdtemp %s:", path);
-			exit(1);
+			return 1;
 		}
 	} else {
 		if ((fd = mkstemp(path)) < 0) {
 			if (!qflag)
 				eprintf("mkstemp %s:", path);
-			exit(1);
+			return 1;
 		}
 		close(fd);
 	}
 	puts(path);
+
 	return 0;
 }