diff --git a/devel/elf/Makefile b/devel/elf/Makefile
index a8c03f3d9db7..b1628609ab42 100644
--- a/devel/elf/Makefile
+++ b/devel/elf/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	elf
 PORTVERSION=	0.5.4p1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	PACKETSTORM/linux/reverse-engineering
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Commandline based ELF header analyzer
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake libedit readline
 GNU_CONFIGURE=	yes
-PLIST_FILES=	bin/elf man/man1/elf.1.gz
+PLIST_FILES=	bin/elf share/man/man1/elf.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/src/Makefile.in
 
 do-build:
 	${DO_MAKE_BUILD} -C ${WRKSRC}/src
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/elf/files/patch-Makefile.in b/devel/elf/files/patch-Makefile.in
index cf52ecdcbed1..a25b2a467c28 100644
--- a/devel/elf/files/patch-Makefile.in
+++ b/devel/elf/files/patch-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in.orig	2014-06-07 13:38:33.334423095 +0800
-+++ Makefile.in	2014-06-07 13:39:03.004421673 +0800
-@@ -1,9 +1,9 @@
+--- Makefile.in.orig	2003-09-20 14:23:28 UTC
++++ Makefile.in
+@@ -1,9 +1,9 @@ all:		./src/Makefile
  all:		./src/Makefile
 -		cd ./src; make; cd ../
 +		cd ./src; ${MAKE}
  
  install:	./src/Makefile ./doc/Makefile
 -		cd ./src; make install; cd ../
 -		cd ./doc; make install; cd ../
 +		cd ./src; ${MAKE} install
 +		cd ./doc; ${MAKE} install
  
  uninstall:	./src/Makefile ./doc/Makefile
  		cd ./src;make uninstall; cd ../
diff --git a/devel/elf/files/patch-doc__Makefile.in b/devel/elf/files/patch-doc__Makefile.in
index 6656b0e34cec..9155ab611f8d 100644
--- a/devel/elf/files/patch-doc__Makefile.in
+++ b/devel/elf/files/patch-doc__Makefile.in
@@ -1,13 +1,19 @@
---- doc/Makefile.in.orig	2014-06-07 13:36:10.752433006 +0800
-+++ doc/Makefile.in	2014-06-07 13:36:26.417432242 +0800
-@@ -5,8 +5,8 @@ INSDIR=@prefix@/man/man1
+--- doc/Makefile.in.orig	2003-09-20 14:23:28 UTC
++++ doc/Makefile.in
+@@ -1,12 +1,12 @@ INC=-I../include
+ CC=gcc
+ CFLAGS=@CFLAGS@
+ INC=-I../include
+-INSDIR=@prefix@/man/man1
++INSDIR=@prefix@/share/man/man1
  
  
- install:	
+-install:	
 -		cp elf.1 $(INSDIR)/
 -		chmod 644 $(INSDIR)/elf.1
++install:
 +		cp elf.1 $(DESTDIR)$(INSDIR)/
 +		chmod 644 $(DESTDIR)$(INSDIR)/elf.1
  
  uninstall:	install
  		rm $(INSDIR)/elf.1
diff --git a/devel/elf/files/patch-src__Makefile.in b/devel/elf/files/patch-src__Makefile.in
index d6bc0d078c6a..33a6ca0787ed 100644
--- a/devel/elf/files/patch-src__Makefile.in
+++ b/devel/elf/files/patch-src__Makefile.in
@@ -1,23 +1,24 @@
---- src/Makefile.in.orig	2003-09-20 10:23:28.000000000 -0400
-+++ src/Makefile.in	2014-08-15 12:59:59.000000000 -0400
+--- src/Makefile.in.orig	2003-09-20 14:23:28 UTC
++++ src/Makefile.in
 @@ -1,9 +1,9 @@
- CC=gcc
+-CC=gcc
 -INC=-I../include
++CC=cc
 +INC=-I../include ${CPPFLAGS}
  CFLAGS=@CFLAGS@
  PREFIX=@prefix@
  BINDIR=$(PREFIX)/bin
 -LIBS=@LIBS@
 +LIBS=@LIBS@ ${LDFLAGS}
  
  elf:		main.o elf.o
  		$(CC) $(CFLAGS) $(INC) main.o elf.o -o elf $(LIBS)
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ install:	elf
  		$(CC) $(CFLAGS) $(INC) -c main.c
  
  install:	elf
 -		cp elf $(BINDIR)
 +		cp elf $(DESTDIR)$(BINDIR)
  
  uninstall:	install
  		rm $(BINDIR)/elf