diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 5ac2973fdee4..f72c2e479633 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -1,40 +1,37 @@
 PORTNAME=	leafpad
 PORTVERSION=	0.8.19
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	GTK+ based simple text editor
 WWW=		http://tarot.freeshell.org/leafpad/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz
 
-USES=		desktop-file-utils gmake gnome pkgconfig
+USES=		desktop-file-utils gettext gmake gnome pkgconfig
 USE_GNOME=	cairo gdkpixbuf2 gtk20 intlhack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-chooser
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL README
 
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
-
-NLS_USES=		gettext
-NLS_CONFIGURE_ENABLE=	nls
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-extract:
 	@${CHMOD} a+x ${WRKSRC}/install-sh
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/leafpad/pkg-plist b/editors/leafpad/pkg-plist
index 247ef5607d03..90b8582356b6 100644
--- a/editors/leafpad/pkg-plist
+++ b/editors/leafpad/pkg-plist
@@ -1,47 +1,47 @@
 bin/leafpad
 share/applications/leafpad.desktop
 share/icons/hicolor/16x16/apps/leafpad.png
 share/icons/hicolor/22x22/apps/leafpad.png
 share/icons/hicolor/24x24/apps/leafpad.png
 share/icons/hicolor/32x32/apps/leafpad.png
 share/icons/hicolor/scalable/apps/leafpad.svg
-%%NLS%%share/locale/bg/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/br/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/da/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/de/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/el/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/es/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/he/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/id/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/it/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/leafpad.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/leafpad.mo
+share/locale/bg/LC_MESSAGES/leafpad.mo
+share/locale/br/LC_MESSAGES/leafpad.mo
+share/locale/ca/LC_MESSAGES/leafpad.mo
+share/locale/cs/LC_MESSAGES/leafpad.mo
+share/locale/da/LC_MESSAGES/leafpad.mo
+share/locale/de/LC_MESSAGES/leafpad.mo
+share/locale/el/LC_MESSAGES/leafpad.mo
+share/locale/eo/LC_MESSAGES/leafpad.mo
+share/locale/es/LC_MESSAGES/leafpad.mo
+share/locale/eu/LC_MESSAGES/leafpad.mo
+share/locale/fi/LC_MESSAGES/leafpad.mo
+share/locale/fr/LC_MESSAGES/leafpad.mo
+share/locale/ga/LC_MESSAGES/leafpad.mo
+share/locale/gl/LC_MESSAGES/leafpad.mo
+share/locale/he/LC_MESSAGES/leafpad.mo
+share/locale/hu/LC_MESSAGES/leafpad.mo
+share/locale/id/LC_MESSAGES/leafpad.mo
+share/locale/it/LC_MESSAGES/leafpad.mo
+share/locale/ja/LC_MESSAGES/leafpad.mo
+share/locale/ko/LC_MESSAGES/leafpad.mo
+share/locale/lt/LC_MESSAGES/leafpad.mo
+share/locale/lv/LC_MESSAGES/leafpad.mo
+share/locale/nl/LC_MESSAGES/leafpad.mo
+share/locale/nn/LC_MESSAGES/leafpad.mo
+share/locale/pl/LC_MESSAGES/leafpad.mo
+share/locale/pt/LC_MESSAGES/leafpad.mo
+share/locale/pt_BR/LC_MESSAGES/leafpad.mo
+share/locale/ru/LC_MESSAGES/leafpad.mo
+share/locale/sk/LC_MESSAGES/leafpad.mo
+share/locale/sl/LC_MESSAGES/leafpad.mo
+share/locale/sr/LC_MESSAGES/leafpad.mo
+share/locale/sv/LC_MESSAGES/leafpad.mo
+share/locale/ta/LC_MESSAGES/leafpad.mo
+share/locale/tr/LC_MESSAGES/leafpad.mo
+share/locale/uk/LC_MESSAGES/leafpad.mo
+share/locale/vi/LC_MESSAGES/leafpad.mo
+share/locale/zh_CN/LC_MESSAGES/leafpad.mo
+share/locale/zh_TW/LC_MESSAGES/leafpad.mo
 share/pixmaps/leafpad.png
 share/pixmaps/leafpad.xpm