diff --git a/editors/nano-devel/Makefile b/editors/nano-devel/Makefile
index 5b702f6bf9e8..23a5fde99261 100644
--- a/editors/nano-devel/Makefile
+++ b/editors/nano-devel/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	nano
-PORTVERSION=	2.3.3
+PORTVERSION=	2.3.6
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nano-editor.org/dist/v${PORTVERSION:R}/ \
 		${MASTER_SITE_GNU}
 
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 
 LICENSE=	GPLv3
@@ -17,36 +17,21 @@ CONFLICTS=	nano-2*
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--docdir=${DOCSDIR}
+CONFIGURE_ARGS+=	--docdir=${DOCSDIR} --enable-utf8
+MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
-.else
-MAKE_ARGS+=	install_htmlmanDATA=""
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 INFO=		nano
 
 PORTSCOUT=	limitw:1,odd
 
-.include <bsd.port.pre.mk>
-
-CONFIGURE_ARGS+=--enable-utf8
-
 post-build:
 	cd ${WRKSRC}/doc/man; ${REINPLACE_CMD} \
 		-e 's:SYSCONFDIR:${PREFIX}/etc:g' \
@@ -59,4 +44,4 @@ post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/nanorc.sample ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/nano-devel/distinfo b/editors/nano-devel/distinfo
index d1757b76ca2d..b8d53417755a 100644
--- a/editors/nano-devel/distinfo
+++ b/editors/nano-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nano-2.3.3.tar.gz) = d80e0fce656b5cd2f327ea599c708c897dc1b8c608e87c756d63c79e97e8cc19
-SIZE (nano-2.3.3.tar.gz) = 1812671
+SHA256 (nano-2.3.6.tar.gz) = a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534
+SIZE (nano-2.3.6.tar.gz) = 1816012