--- x11/xkeyboard-config/Makefile	(revision 521949)
+++ x11/xkeyboard-config/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	xkeyboard-config
 PORTVERSION=	2.27
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	XORG/individual/${XORG_CAT}/${PORTNAME}
 
@@ -22,21 +23,18 @@ 
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg
 
-OPTIONS_DEFINE=	ETERSOFT
+OPTIONS_DEFINE=	ETERSOFT NLS
+OPTIONS_DEFAULT=NLS
+OPTIONS_SUB=	yes
+
 ETERSOFT_DESC=	Add pre-1918 Russian letters to typographic layout
 ETERSOFT_EXTRA_PATCHES=	${FILESDIR}/etersoft-patch-symbols-typo
 
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+
 .include <bsd.port.options.mk>
 
-# !nls case doesn't work correctly, comment it out.
-#.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext-tools iconv
-PLIST_SUB+=	NLS=""
-#.else
-#CONFIGURE_ARGS+=--disable-nls
-#PLIST_SUB+=	NLS="@comment "
-#.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \
 		${WRKSRC}/rules/merge.sh