diff --git a/converters/btoa/Makefile b/converters/btoa/Makefile
index 8400c2a8458a..3efe397d777f 100644
--- a/converters/btoa/Makefile
+++ b/converters/btoa/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	btoa
 PORTVERSION=	5.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	converters
 MASTER_SITES=	LOCAL/pgollucci
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Encode/decode binary to printable ASCII
 
 DESTDIRNAME=	IGNOREME
 MAKE_ARGS=	DESTDIR=${STAGEDIR}${PREFIX}
 MAKEFILE=	Makefile.sun
 
 .include <bsd.port.mk>
diff --git a/converters/btoa/files/patch-Makefile.sun b/converters/btoa/files/patch-Makefile.sun
index 8017f45b9eec..f892a404c217 100644
--- a/converters/btoa/files/patch-Makefile.sun
+++ b/converters/btoa/files/patch-Makefile.sun
@@ -1,39 +1,39 @@
 --- Makefile.sun.orig	Fri Oct  8 05:00:00 1993
 +++ Makefile.sun	Sun Oct 19 01:28:03 2003
 @@ -1,13 +1,32 @@
  OBJS     = btoa.o atob.o repair.o
  
 +DESTDIR  ?= /usr/local
 +
 +CC ?= cc
 +CFLAGS ?= -O -pipe
 +
 +all:	btoa
 +
  btoa:	$(OBJS)
 -	cc -O $(OBJS) -o btoa
 +	$(CC) $(CFLAGS) $(OBJS) -o btoa
  
  btoa.o: btoa.c btoa.h chksum.h
 -	cc -c -O btoa.c
 +	$(CC) $(CFLAGS) -c btoa.c
   
  atob.o: atob.c btoa.h chksum.h
 -	cc -c -O atob.c
 +	$(CC) $(CFLAGS) -c atob.c
  
  repair.o: repair.c btoa.h
 -	cc -c -O repair.c
 +	$(CC) $(CFLAGS) -c repair.c
 +
 +install: btoa btoa.1
 +	-@mkdir -p $(DESTDIR)/bin
 +	install -c -s -m 755 btoa $(DESTDIR)/bin/btoa
 +	rm -f $(DESTDIR)/bin/atob
 +	ln $(DESTDIR)/bin/btoa $(DESTDIR)/bin/atob
-+	-@mkdir -p $(DESTDIR)/man/man1
-+	install -c -m 644 btoa.1 $(DESTDIR)/man/man1/btoa.1
++	-@mkdir -p $(DESTDIR)/share/man/man1
++	install -c -m 644 btoa.1 $(DESTDIR)/share/man/man1/btoa.1
 +	strip $(DESTDIR)/bin/btoa
 +
 +clean:
 +	rm -f btoa $(OBJS)
diff --git a/converters/btoa/pkg-plist b/converters/btoa/pkg-plist
index 0feb90807146..ce36f5259a3f 100644
--- a/converters/btoa/pkg-plist
+++ b/converters/btoa/pkg-plist
@@ -1,3 +1,3 @@
 bin/btoa
 bin/atob
-man/man1/btoa.1.gz
+share/man/man1/btoa.1.gz