diff --git a/lrzip.c b/lrzip.c
index e0a515d..e7aca13 100644
--- a/lrzip.c
+++ b/lrzip.c
@@ -85,24 +85,28 @@ static char *make_magic(rzip_control *control)
 	return magic;
 }
 
-void write_stdout_header(rzip_control *control)
+static i64 fdout_seekto(rzip_control *control, i64 pos)
 {
-	char *magic = make_magic(control);
-
-	memcpy(control->tmp_outbuf, magic, MAGIC_LEN);
-	control->magic_written = 1;
-
-	free(magic);
+	if (TMP_OUTBUF) {
+		pos -= control->out_relofs;
+		control->out_ofs = pos;
+		if (unlikely(pos > control->out_len || pos < 0)) {
+			print_err("Trying to seek to %lld outside tmp outbuf in fdout_seekto\n", pos);
+			return -1;
+		}
+		return 0;
+	}
+	return lseek(control->fd_out, 0, SEEK_SET);
 }
 
-static void write_magic(rzip_control *control, int fd_in, int fd_out)
+void write_magic(rzip_control *control)
 {
 	char *magic = make_magic(control);
 
-	if (unlikely(lseek(fd_out, 0, SEEK_SET)))
+	if (unlikely(fdout_seekto(control, 0)))
 		fatal("Failed to seek to BOF to write Magic Header\n");
 
-	if (unlikely(write(fd_out, magic, MAGIC_LEN) != MAGIC_LEN))
+	if (unlikely(put_fdout(control, magic, MAGIC_LEN) != MAGIC_LEN))
 		fatal("Failed to write magic header\n");
 	control->magic_written = 1;
 
@@ -1045,7 +1049,7 @@ void compress_file(rzip_control *control)
 
 	/* Wwrite magic at end b/c lzma does not tell us properties until it is done */
 	if (!STDOUT)
-		write_magic(control, fd_in, fd_out);
+		write_magic(control);
 
 	if (ENCRYPT)
 		release_hashes(control);
diff --git a/lrzip.h b/lrzip.h
index e01190c..b59c351 100644
--- a/lrzip.h
+++ b/lrzip.h
@@ -21,7 +21,7 @@
 
 #include "lrzip_private.h"
 
-void write_magic(rzip_control *control, int fd_in, int fd_out);
+void write_magic(rzip_control *control);
 void read_magic(rzip_control *control, int fd_in, i64 *expected_size);
 void preserve_perms(rzip_control *control, int fd_in, int fd_out);
 int open_tmpoutfile(rzip_control *control);
@@ -32,7 +32,6 @@ void decompress_file(rzip_control *control);
 void get_header_info(rzip_control *control, int fd_in, uchar *ctype, i64 *c_len, i64 *u_len, i64 *last_head);
 void get_fileinfo(rzip_control *control);
 void compress_file(rzip_control *control);
-void write_stdout_header(rzip_control *control);
 void write_fdout(rzip_control *control, void *buf, i64 len);
 void flush_tmpoutbuf(rzip_control *control);
 void close_tmpoutbuf(rzip_control *control);
diff --git a/stream.c b/stream.c
index 9611e86..d08b005 100644
--- a/stream.c
+++ b/stream.c
@@ -1209,7 +1209,7 @@ retry:
 
 		if (TMP_OUTBUF) {
 			if (!control->magic_written)
-				write_stdout_header(control);
+				write_magic(control);
 			flush_tmpoutbuf(control);
 		}