diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile
index 04fdbc597ca4..2c49cff00b61 100644
--- a/misc/getopt/Makefile
+++ b/misc/getopt/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	getopt
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://frodo.looijaard.name/system/files/software/getopt/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Replacement for getopt(1) that supports GNU-style long options
 WWW=		https://software.frodo.looijaard.name/getopt/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 MAKE_ARGS=	CC=${CC} LIBCGETOPT=0
 USES=		gmake
 
 PORTDOCS=	Changelog README
 
 NLS_MAKE_ARGS=		WITHOUT_GETTEXT=0
 NLS_MAKE_ARGS_OFF=	WITHOUT_GETTEXT=1
 NLS_LDFLAGS=		-lintl
 NLS_USES=		gettext localbase:ldflags
 
 post-patch:
 	@${RM} ${WRKSRC}/gnu/*.o
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/getopt
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/misc/getopt/files/patch-Makefile b/misc/getopt/files/patch-Makefile
index a3160ae26b0e..3383ee09c28f 100644
--- a/misc/getopt/files/patch-Makefile
+++ b/misc/getopt/files/patch-Makefile
@@ -1,30 +1,49 @@
---- ./Makefile.orig	2013-03-02 19:04:01.590723827 -0500
-+++ ./Makefile	2013-03-02 19:06:02.492723812 -0500
-@@ -1,7 +1,7 @@
+--- Makefile.orig	2014-11-24 12:33:39 UTC
++++ Makefile
+@@ -1,9 +1,9 @@ DESTDIR=
  .SUFFIXES:
  
  DESTDIR=
 -prefix=/usr/local
 +prefix=$(PREFIX)
  bindir=$(prefix)/bin
- mandir=$(prefix)/man
+-mandir=$(prefix)/man
++mandir=$(prefix)/share/man
  man1dir=$(mandir)/man1
-@@ -32,7 +32,7 @@
- LANGUAGES = ca cs da de es et eu fi fr gl hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
+ sharedir=$(prefix)/share
+ getoptdir=$(sharedir)/getopt
+@@ -32,18 +32,15 @@ MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
+ LANGUAGES = ca cs da de es et eu fi fr gl hr hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
  MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
  
 -CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\"  -Dprogram_version=\"$(VERSION)\"
 +CPPFLAGS+=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\"  -Dprogram_version=\"$(VERSION)\"
  ifeq ($(LIBCGETOPT),0)
- CPPFLAGS+=-I./gnu 
+-CPPFLAGS+=-I./gnu 
++CPPFLAGS+=-I./gnu
  endif
-@@ -41,9 +41,6 @@
+ WARNINGS=-Wall \
+          -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual \
           -Wcast-align -Wmissing-declarations \
           -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
           -Wnested-externs -Winline
 -OPTIMIZE=-O3 -fno-strength-reduce
 -CFLAGS=$(WARNINGS) $(OPTIMIZE)
 -LDFLAGS=
  
  sources=getopt.c
  ifeq ($(LIBCGETOPT),0)
+@@ -54,11 +51,11 @@ binaries=getopt
+ 
+ binaries=getopt
+ 
+-.PHONY: all clean realclean 
++.PHONY: all clean realclean
+ all: $(binaries) all_po
+ 
+ clean: clean_po
+-	-$(RM) $(objects) $(binaries) 
++	-$(RM) $(objects) $(binaries)
+ 
+ getopt: $(objects)
+ 	$(CC) $(LDFLAGS) -o $@ $(objects)
diff --git a/misc/getopt/pkg-plist b/misc/getopt/pkg-plist
index 2136ebe6e0af..11fb45cc30a2 100644
--- a/misc/getopt/pkg-plist
+++ b/misc/getopt/pkg-plist
@@ -1,28 +1,28 @@
 bin/getopt
-man/man1/getopt.1.gz
+share/man/man1/getopt.1.gz
 %%NLS%%share/locale/ca/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/da/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/de/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/es/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/et/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/id/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/it/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/getopt.mo