diff --git a/src/Makefile b/src/Makefile
index 13dd9fb..557d623 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,3 @@
-# On Mac OSX gcc is required as clang complains bitterly about the old style
-# C delarations used.
-
 # FIXME: parallel build doesn't work due to doc.inl
 
 CC=gcc
@@ -12,10 +9,16 @@ HOSTCC ?= $(CC)
 YACC=bison -y
 # Is there a YACCFLAGS?
 
-.PHONY: all clean
+INSTALL_PREFIX = /usr/local
+
+.PHONY: all clean install
 
 all: zmac zmac.1.gz
 
+install: zmac zmac.1
+	install -m 755 zmac $(INSTALL_PREFIX)/bin/zmac
+	install -m 644 zmac.1 $(INSTALL_PREFIX)/man/man1/zmac.1
+
 zmac: doc.inl $(DEP)
 	$(CC) -Wall $(CFLAGS) -o zmac $(DEP)
 
diff --git a/src/mio.c b/src/mio.c
index 05240bc..f0d63f0 100644
--- a/src/mio.c
+++ b/src/mio.c
@@ -17,8 +17,7 @@ static unsigned char *mptr;			/* pointer to current position */
 static unsigned int msize;			/* size of chunk mhead points to */
 
 FILE *
-mfopen(filename,mode)
-char *filename,*mode;
+mfopen(char *filename, char *mode)
 {
 	if ((mhead = malloc(MALLOC_SIZE)) == 0) {
 		msize = 0;
@@ -30,8 +29,7 @@ char *filename,*mode;
 }
 
 int
-mfclose(f)
-FILE *f;
+mfclose(FILE *f)
 {
 	if (mhead) {
 		free(mhead);
@@ -42,9 +40,7 @@ FILE *f;
 }
 
 unsigned int
-mfputc(c,f)
-unsigned int c;
-FILE *f;
+mfputc(unsigned int c,FILE *f)
 {
 register unsigned char *p;
 	while (mptr >= mhead + msize) {
@@ -64,8 +60,7 @@ register unsigned char *p;
 }
 
 unsigned int
-mfgetc(f)
-FILE *f;
+mfgetc(FILE *f)
 {
 	if (mptr >= mend)		/* no characters left */
 		return (-1);
@@ -74,10 +69,7 @@ FILE *f;
 }
 
 int
-mfseek(f,loc,origin)
-FILE *f;
-long loc;
-int origin;
+mfseek(FILE *f, long loc, int origin)
 {
 	if (origin != 0) {
 		fputs("mseek() only implemented with 0 origin",stderr);
@@ -88,10 +80,7 @@ int origin;
 }
 
 int
-mfread(ptr, size, nitems,f)
-char *ptr;
-unsigned int size, nitems;
-FILE *f;
+mfread(char *ptr, unsigned int size, unsigned int nitems, FILE *f)
 {
 register unsigned int i = 0;
 	while (i < nitems) {
@@ -106,10 +95,7 @@ register unsigned int i = 0;
 }
 
 int
-mfwrite(ptr, size, nitems, f)
-char *ptr;
-int size, nitems;
-FILE *f;
+mfwrite(char *ptr, int size, int nitems, FILE *f)
 {
 register int i = 0;
 register unsigned char *p;
diff --git a/src/zmac.y b/src/zmac.y
index 395cf2a..6077eeb 100644
--- a/src/zmac.y
+++ b/src/zmac.y
@@ -742,7 +742,7 @@ void putout(int value);
 int outrec;
 int outlen;
 unsigned char outbuf[1024 * 1024];
-void bookmark();
+void bookmark(int);
 void listfrombookmark();
 
 
@@ -5925,7 +5925,7 @@ int nextchar()
 {
 	int c, ch;
 	unsigned char *p;
-	char *getlocal();
+	char *getlocal(int, int);
 
 	if (peekc != NOPEEK) {
 		c = peekc;