diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 249f24f93e7e..9a281c20b95c 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,47 +1,47 @@
 # Created by: Philippe Lefebvre <nemesis@balistik.net>
 # $FreeBSD$
 
 PORTNAME=	nano
-PORTVERSION=	2.8.1
+PORTVERSION=	2.8.2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nano-editor.org/dist/v${PORTVERSION:R}/ GNU
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 
 LICENSE=	GPLv3
 
 CONFLICTS=	nano-devel-2*
 
 USES=		charsetfix ncurses
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} --enable-utf8
 MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS EXAMPLES NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 INFO=		nano
 
 PORTSCOUT=	limitw:1,even
 
 post-configure:
 	${REINPLACE_CMD} -e 's/update_revision//g' ${WRKSRC}/src/Makefile
 
 post-build:
 	cd ${WRKSRC}/doc; ${REINPLACE_CMD} \
 		-e 's:SYSCONFDIR:${PREFIX}/etc:g' \
 		-e 's:EXAMPLESDIR:${EXAMPLESDIR}:g' \
 		nano.1 rnano.1 nanorc.5 ${WRKSRC}/doc/${INFO:=.info}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.nanorc ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/nano/distinfo b/editors/nano/distinfo
index a9783a4840c6..01e9aae84f07 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492091367
-SHA256 (nano-2.8.1.tar.gz) = a48650dab5fc069bb953d020721b6c0f650969abf5a34a27dfd6f038215c5910
-SIZE (nano-2.8.1.tar.gz) = 2757328
+TIMESTAMP = 1494182218
+SHA256 (nano-2.8.2.tar.gz) = 0aa9cd6bd5b372ce9a196a9677af58c1826a9235a14daffe604100a9c259854b
+SIZE (nano-2.8.2.tar.gz) = 2778849
diff --git a/editors/nano/pkg-plist b/editors/nano/pkg-plist
index c450342c67cb..a829997109bd 100644
--- a/editors/nano/pkg-plist
+++ b/editors/nano/pkg-plist
@@ -1,87 +1,88 @@
 bin/nano
 bin/rnano
 man/man1/nano.1.gz
 man/man1/rnano.1.gz
 man/man5/nanorc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/nano.1.html
 %%PORTDOCS%%%%DOCSDIR%%/nano.html
 %%PORTDOCS%%%%DOCSDIR%%/nanorc.5.html
 %%PORTDOCS%%%%DOCSDIR%%/rnano.1.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.nanorc
 %%NLS%%share/locale/bg/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/da/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/de/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/es/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/id/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/it/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/nano.mo
 %%DATADIR%%/asm.nanorc
 %%DATADIR%%/autoconf.nanorc
 %%DATADIR%%/awk.nanorc
 %%DATADIR%%/c.nanorc
 %%DATADIR%%/changelog.nanorc
 %%DATADIR%%/cmake.nanorc
 %%DATADIR%%/css.nanorc
 %%DATADIR%%/debian.nanorc
 %%DATADIR%%/default.nanorc
 %%DATADIR%%/elisp.nanorc
 %%DATADIR%%/fortran.nanorc
 %%DATADIR%%/gentoo.nanorc
 %%DATADIR%%/go.nanorc
 %%DATADIR%%/groff.nanorc
 %%DATADIR%%/guile.nanorc
 %%DATADIR%%/html.nanorc
 %%DATADIR%%/java.nanorc
 %%DATADIR%%/javascript.nanorc
 %%DATADIR%%/json.nanorc
 %%DATADIR%%/lua.nanorc
 %%DATADIR%%/makefile.nanorc
 %%DATADIR%%/man.nanorc
 %%DATADIR%%/mgp.nanorc
 %%DATADIR%%/mutt.nanorc
+%%DATADIR%%/nanohelp.nanorc
 %%DATADIR%%/nanorc.nanorc
 %%DATADIR%%/nftables.nanorc
 %%DATADIR%%/objc.nanorc
 %%DATADIR%%/ocaml.nanorc
 %%DATADIR%%/patch.nanorc
 %%DATADIR%%/perl.nanorc
 %%DATADIR%%/php.nanorc
 %%DATADIR%%/po.nanorc
 %%DATADIR%%/postgresql.nanorc
 %%DATADIR%%/pov.nanorc
 %%DATADIR%%/python.nanorc
 %%DATADIR%%/ruby.nanorc
 %%DATADIR%%/rust.nanorc
 %%DATADIR%%/sh.nanorc
 %%DATADIR%%/spec.nanorc
 %%DATADIR%%/tcl.nanorc
 %%DATADIR%%/tex.nanorc
 %%DATADIR%%/texinfo.nanorc
 %%DATADIR%%/xml.nanorc