diff --git a/converters/base91/Makefile b/converters/base91/Makefile
index b10b096139c8..487ec01f86eb 100644
--- a/converters/base91/Makefile
+++ b/converters/base91/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	base91
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	SF/${PORTNAME}/basE91/${PORTVERSION}/
 
 MAINTAINER=	takefu@airport.fm
 COMMENT=	Utility to encode and decode base91 files
 WWW=		https://base91.sourceforge.net/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # INSTALL_DATA is only used to install documentation related files
 MAKE_ENV+=	INSTALL_DATA="${INSTALL_MAN}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
 PLIST_FILES=	bin/b91dec \
 		bin/b91enc \
 		bin/base91 \
-		man/man1/b91dec.1.gz \
-		man/man1/b91enc.1.gz \
-		man/man1/base91.1.gz
+		share/man/man1/b91dec.1.gz \
+		share/man/man1/b91enc.1.gz \
+		share/man/man1/base91.1.gz
 
 .include <bsd.port.mk>
diff --git a/converters/base91/files/patch-Makefile b/converters/base91/files/patch-Makefile
index 989205168c5d..73ddf207077d 100644
--- a/converters/base91/files/patch-Makefile
+++ b/converters/base91/files/patch-Makefile
@@ -1,35 +1,31 @@
 --- Makefile.orig	2006-09-03 18:00:00 UTC
 +++ Makefile
-@@ -1,15 +1,15 @@
+@@ -1,12 +1,12 @@
 -CFLAGS = -Wall -W -O2
 -LDFLAGS = -s
 +CFLAGS ?= -Wall -W -O2
 +LDFLAGS ?= -s
  
 -CC = gcc
 -INSTALL = install
 -INSTALL_DATA = $(INSTALL) -m 444
 -INSTALL_PROGRAM = $(INSTALL) -m 555
 +CC ?= gcc
 +INSTALL ?= install
 +INSTALL_DATA ?= $(INSTALL) -m 444
 +INSTALL_PROGRAM ?= $(INSTALL) -m 555
  
 -prefix = /usr/local
 +prefix = ${PREFIX}
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
--mandir = $(prefix)/share/man
-+mandir = $(prefix)/man
- man1dir = $(mandir)/man1
- manext = .1
- 
-@@ -23,7 +23,7 @@ all: $(BIN)
+ mandir = $(prefix)/share/man
+@@ -23,7 +23,7 @@ base91: cli.o base91.o
  	$(CC) $(CFLAGS) -c $<
  
  base91: cli.o base91.o
 -	$(CC) $(LDFLAGS) -o $@ $^
 +	$(CC) $(LDFLAGS) -o $@ cli.o base91.o
  
  install: all
  	mkdir -p $(DESTDIR)$(bindir)