diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile
index dc0bbfa9cb61..5d0025cd7760 100644
--- a/editors/uzap/Makefile
+++ b/editors/uzap/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	uzap
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	LOCAL/joerg
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Visual binary file editor
 
 # Has been posted to alt.sources in 1989
 # http://www.megalextoria.com/usenet-archive/news097f1/b120/alt/sources/00000521.html
 # Converted from NO_CDROM
 LICENSE=	uzap
 LICENSE_NAME=	uzap
 LICENSE_TEXT=	This software may not be used to make a profit in any way.
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 USES=		ncurses
 
 NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	bin/uzap man/man1/uzap.1.gz
+PLIST_FILES=	bin/uzap share/man/man1/uzap.1.gz
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/uzap/files/patch-Makefile b/editors/uzap/files/patch-Makefile
index 260e4fc677d9..a3944b7d6768 100644
--- a/editors/uzap/files/patch-Makefile
+++ b/editors/uzap/files/patch-Makefile
@@ -1,42 +1,42 @@
 --- Makefile.orig	1989-03-30 18:04:11 UTC
 +++ Makefile
 @@ -1,26 +1,28 @@
  # Makefile for Uzap.
 -BINDIR = /usr/local
 -MANDIR = /usr/man/manl
 -MSECT = l
 +BINDIR = ${PREFIX}/bin/
-+MANDIR = ${PREFIX}/man/man1
++MANDIR = ${PREFIX}/share/man/man1
 +MSECT = 1
 +
 +all: uzap
  
  uzap: uzap.o edit.o search.o screen.o
 -	cc -O uzap.o edit.o search.o screen.o -lcurses -ltermcap -o uzap
 +	$(CC) $(CFLAGS) uzap.o edit.o search.o screen.o $(LDFLAGS) -lncurses -o uzap
  
  uzap.o: uzap.c 
 -	cc -c -O uzap.c  
 +	$(CC) -c $(CFLAGS) uzap.c  
  
  edit.o: edit.c
 -	cc -c -O edit.c 
 +	$(CC) -c $(CFLAGS) edit.c 
  
  search.o: search.c
 -	cc -c -O search.c
 +	$(CC) -c $(CFLAGS) search.c
  
  screen.o: screen.c
 -	cc -c -O screen.c
 +	$(CC) -c $(CFLAGS) screen.c
  
  install: uzap
 -	install -s -m 771 uzap $(BINDIR)
 -	install -c -m 664 uzap.man $(MANDIR)/uzap.$(MSECT)
 +	$(BSD_INSTALL_PROGRAM) uzap $(DESTDIR)$(BINDIR)
 +	$(BSD_INSTALL_MAN) uzap.man $(DESTDIR)$(MANDIR)/uzap.$(MSECT)
  
  clean:
 -	rm -f *.o core uzap
 +	rm -f *.o core *.core uzap