diff --git a/audio/beep/Makefile b/audio/beep/Makefile
index 5b629763596c..20135f2e12ca 100644
--- a/audio/beep/Makefile
+++ b/audio/beep/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	beep
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/garga/${PORTNAME}
 
@@ -13,7 +13,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-PLIST_FILES=	bin/beep man/man1/beep.1.gz
+PLIST_FILES=	bin/beep share/man/man1/beep.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} 's|machine/speaker\.h|dev/speaker/speaker.h|' \
diff --git a/audio/beep/files/patch-Makefile b/audio/beep/files/patch-Makefile
index dafc18050252..dd314e189618 100644
--- a/audio/beep/files/patch-Makefile
+++ b/audio/beep/files/patch-Makefile
@@ -11,3 +11,12 @@
  PROG=	beep
  SRCS=	${PROG}.c ${PROG}.h
  LDADD=
+@@ -7,7 +12,7 @@ BINDIR=	${PREFIX}/bin
+ 
+ PREFIX?=	/usr/local
+ BINDIR=	${PREFIX}/bin
+-MANDIR=	${PREFIX}/man/man
++MANDIR=	${PREFIX}/share/man/man
+ 
+ .if defined(DEBUG)
+ CFLAGS=	-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual \