diff --git a/audio/beep/Makefile b/audio/beep/Makefile
index 5b629763596c..20135f2e12ca 100644
--- a/audio/beep/Makefile
+++ b/audio/beep/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	beep
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/garga/${PORTNAME}
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Beeps a certain duration and pitch out of the PC Speaker
 
 LICENSE=	BSD4CLAUSE
 
 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|' \
 		${WRKSRC}/beep.c
 
 .include <bsd.port.mk>
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
@@ -1,13 +1,22 @@
 --- Makefile.orig	2002-06-09 13:26:27 UTC
 +++ Makefile
 @@ -1,5 +1,10 @@
  # $Id: Makefile,v 1.1.1.1 2002/06/09 13:26:27 andrew Exp $
  
 +BINOWN!=	/usr/bin/id -n -u
 +BINGRP!=	/usr/bin/id -n -g
 +SHAREOWN=	${BINOWN}
 +SHAREGRP=	${BINGRP}
 +
  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 \