diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile
index c46d9eafdc11..053789bfe1d9 100644
--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	obexapp
 PORTVERSION=	1.4.15
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms net
 MASTER_SITES=	http://people.freebsd.org/~emax/obexapp/
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Obex application to transfer objects to mobile equipment
 
 LIB_DEPENDS=	libopenobex.so:comms/openobex \
 		libexpat.so:textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		iconv readline uidfix
-PLIST_FILES=	bin/obexapp man/man1/obexapp.1.gz
+PLIST_FILES=	bin/obexapp share/man/man1/obexapp.1.gz
 
 MAKE_ENV+=	MK_WERROR=no
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/comms/obexapp/files/patch-Makefile b/comms/obexapp/files/patch-Makefile
index 9ae9fd81dddb..fe795985abba 100644
--- a/comms/obexapp/files/patch-Makefile
+++ b/comms/obexapp/files/patch-Makefile
@@ -1,31 +1,31 @@
---- Makefile.orig	2010-11-03 19:28:50.000000000 +0100
-+++ Makefile	2010-11-17 22:40:49.360429702 +0100
+--- Makefile.orig	2010-11-03 18:28:50 UTC
++++ Makefile
 @@ -1,8 +1,11 @@
  # $Id: Makefile,v 1.13 2010/11/03 18:28:50 max Exp $
  # $FreeBSD$
  
 -BINDIR=		/usr/local/bin
 -MANDIR=		/usr/local/man/man
 +PREFIX?=	/usr/local
 +LOCALBASE?=	/usr/local
 +
 +BINDIR=		${PREFIX}/bin
-+MANDIR=		${PREFIX}/man/man
++MANDIR=		${PREFIX}/share/man/man
  PROG=		obexapp
  MAN1=		obexapp.1
  
-@@ -13,11 +16,11 @@
+@@ -13,11 +16,11 @@ DEBUG_FLAGS=	-g
  
  DEBUG_FLAGS=	-g
  
 -CFLAGS+=	-I/usr/local/include \
 -		-I/usr/local/include/openobex
 +CFLAGS+=	-idirafter ${LOCALBASE}/include \
 +		-I${LOCALBASE}/include/openobex
  
  DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBREADLINE}
 -LDADD=		-L/usr/lib -L/usr/local/lib \
 +LDADD=		-L/usr/lib -L${LOCALBASE}/lib \
  		-lbluetooth -lsdp -lopenobex -lexpat -lreadline -liconv
  
  .include <bsd.prog.mk>